Attachment #218753 for bug #250359

View | Details | Raw Unified | Return to bug 250359
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	duktape
DISTVERSION=	2.6.0
CATEGORIES=	lang devel
MASTER_SITES=	https://duktape.org/
PKGNAMESUFFIX=	-lib

USES=		gmake tar:xz
USE_LDCONFIG=	yes

MAKE_ARGS+=	CC=${CC}
MAKEFILE=	Makefile.sharedlibrary

MAJOR=	206
MINOR=	20600

PLIST_FILES=	include/duk_config.h \
		include/duktape.h \
		lib/libduktape.so \
		lib/libduktape.so.${MAJOR} \
		lib/libduktape.so.${MAJOR}.${MINOR}
		lib/libduktaped.so \
		lib/libduktaped.so.${MAJOR} \
		lib/libduktaped.so.${MAJOR}.${MINOR}

do-install:
	${INSTALL_DATA} ${WRKSRC}/src/duktape.h ${STAGEDIR}${PREFIX}/include
	${INSTALL_DATA} ${WRKSRC}/src/duk_config.h ${STAGEDIR}${PREFIX}/include
	${INSTALL_LIB} ${WRKSRC}/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib
	${RLN} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/libduktape.so
	${RLN} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}
	${RLN} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR}
.endfor

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/lang/duktape-lib/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1575253869	1	TIMESTAMP = 1602747604
2	SHA256 (duktape-2.5.0.tar.xz) = 83d411560a1cd36ea132bd81d8d9885efe9285c6bc6685c4b71e69a0c4329616	2	SHA256 (duktape-2.6.0.tar.xz) = 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7
3	SIZE (duktape-2.5.0.tar.xz) = 1031188	3	SIZE (duktape-2.6.0.tar.xz) = 1035160




--- Makefile.sharedlibrary.orig	2020-10-12 22:23:10 UTC
+++ Makefile.sharedlibrary
@@ -52,22 +52,20 @@ INSTALL_PREFIX = /usr/local
 DUKTAPE_SRCDIR = ./src
 #DUKTAPE_SRCDIR = ./src-noline
 
-CC = gcc
-
 .PHONY: all
-all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
+all: libduktape.$(SO_REALNAME_SUFFIX)
 
 # If the default duk_config.h is not suitable for the distribution, modify it
 # before compiling the shared library and copy the same, edited duk_config.h
 # to $INSTALL_PREFIX/include on installation.
 
 libduktape.$(SO_REALNAME_SUFFIX):
-	$(CC) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \
+	$(CC) -shared -fPIC -Wall -Wextra ${CFLAGS} -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \
 		-o $@ $(DUKTAPE_SRCDIR)/duktape.c
 
-libduktaped.$(SO_REALNAME_SUFFIX):
-	$(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \
-		-o $@ $(DUKTAPE_SRCDIR)/duktape.c
+#libduktaped.$(SO_REALNAME_SUFFIX):
+#	$(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \
+#		-o $@ $(DUKTAPE_SRCDIR)/duktape.c
 
 # Symlinks depend on platform conventions.
 .PHONY: install
@@ -77,12 +75,12 @@ install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.
 	rm -f $(INSTALL_PREFIX)/lib/libduktape.so $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX)
 	ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.so
 	ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX)
-	rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
-	ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so
-	ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
+#	rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
+#	ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so
+#	ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
 	mkdir -p $(INSTALL_PREFIX)/include/
 	cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(INSTALL_PREFIX)/include/
 
 CCOPTS = -I./examples/cmdline
 duk:
-	$(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm
+	$(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra ${CFLAGS} -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm

Return to bug 250359

Lines 1-7 Link Here

(-)b/lang/duktape-lib/Makefile (-13 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= duktape	3	PORTNAME= duktape
4	DISTVERSION= 2.5.0	4	DISTVERSION= 2.6.0
5	CATEGORIES= lang devel	5	CATEGORIES= lang devel
6	MASTER_SITES= https://duktape.org/	6	MASTER_SITES= https://duktape.org/
7	PKGNAMESUFFIX= -lib	7	PKGNAMESUFFIX= -lib
Lines 15-42 LICENSE_FILE= ${WRKSRC}/LICENSE.txt Link Here
15	USES= gmake tar:xz	15	USES= gmake tar:xz
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17		17
18	MAKE_ARGS+= CC=${CC}
19	MAKEFILE= Makefile.sharedlibrary	18	MAKEFILE= Makefile.sharedlibrary
20		19
21	MAJOR= 205	20	MAJOR= 206
22	MINOR= 20500	21	MINOR= 20600
23		22
24	PLIST_FILES= include/duk_config.h \	23	PLIST_FILES= include/duk_config.h \
25	include/duktape.h \	24	include/duktape.h \
26	lib/libduktape.so \	25	lib/libduktape.so \
27	lib/libduktape.so.${MAJOR} \	26	lib/libduktape.so.${MAJOR} \
28	lib/libduktape.so.${MAJOR}.${MINOR} \	27	lib/libduktape.so.${MAJOR}.${MINOR}
29	lib/libduktaped.so \
30	lib/libduktaped.so.${MAJOR} \
31	lib/libduktaped.so.${MAJOR}.${MINOR}
32		28
33	do-install:	29	do-install:
34	${INSTALL_DATA} ${WRKSRC}/src/duktape.h ${STAGEDIR}${PREFIX}/include	30	${INSTALL_DATA} ${WRKSRC}/src/duktape.h ${STAGEDIR}${PREFIX}/include
35	${INSTALL_DATA} ${WRKSRC}/src/duk_config.h ${STAGEDIR}${PREFIX}/include	31	${INSTALL_DATA} ${WRKSRC}/src/duk_config.h ${STAGEDIR}${PREFIX}/include
36	.for l in libduktape.so libduktaped.so	32	${INSTALL_LIB} ${WRKSRC}/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib
37	${INSTALL_LIB} ${WRKSRC}/${l}.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib	33	${RLN} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/libduktape.so
38	${RLN} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/${l}	34	${RLN} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}
39	${RLN} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR}
40	.endfor
41		35
42	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Added Link Here

(-)b/lang/duktape-lib/files/patch-Makefile.sharedlibrary (-1 / +47 lines)
0	-	1	--- Makefile.sharedlibrary.orig 2020-10-12 22:23:10 UTC
		2	+++ Makefile.sharedlibrary
		3	@@ -52,22 +52,20 @@ INSTALL_PREFIX = /usr/local
		4	DUKTAPE_SRCDIR = ./src
		5	#DUKTAPE_SRCDIR = ./src-noline
		6
		7	-CC = gcc
		8	-
		9	.PHONY: all
		10	-all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
		11	+all: libduktape.$(SO_REALNAME_SUFFIX)
		12
		13	# If the default duk_config.h is not suitable for the distribution, modify it
		14	# before compiling the shared library and copy the same, edited duk_config.h
		15	# to $INSTALL_PREFIX/include on installation.
		16
		17	libduktape.$(SO_REALNAME_SUFFIX):
		18	- $(CC) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \
		19	+ $(CC) -shared -fPIC -Wall -Wextra ${CFLAGS} -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \
		20	-o $@ $(DUKTAPE_SRCDIR)/duktape.c
		21
		22	-libduktaped.$(SO_REALNAME_SUFFIX):
		23	- $(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \
		24	- -o $@ $(DUKTAPE_SRCDIR)/duktape.c
		25	+#libduktaped.$(SO_REALNAME_SUFFIX):
		26	+# $(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \
		27	+# -o $@ $(DUKTAPE_SRCDIR)/duktape.c
		28
		29	# Symlinks depend on platform conventions.
		30	.PHONY: install
		31	@@ -77,12 +75,12 @@ install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.
		32	rm -f $(INSTALL_PREFIX)/lib/libduktape.so $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX)
		33	ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.so
		34	ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX)
		35	- rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
		36	- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so
		37	- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
		38	+# rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
		39	+# ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so
		40	+# ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX)
		41	mkdir -p $(INSTALL_PREFIX)/include/
		42	cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(INSTALL_PREFIX)/include/
		43
		44	CCOPTS = -I./examples/cmdline
		45	duk:
		46	- $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm
		47	+ $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra ${CFLAGS} -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm