cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak and move do-install to post-install and use the regular install target so

Browse Source 
we can ship the pkgconfig file.
This commit is contained in:
ajacoutot 2022-07-13 06:14:06 +00:00
parent 63c859fa17
commit 026dd4d27d
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/duktape/Makefile
View File

@ -2,8 +2,10 @@ COMMENT = embeddable JavaScript engine
DISTNAME = duktape-2.7.0
EXTRACT_SUFX = .tar.xz
REVISION = 0
SHARED_LIBS += duktape 1.2 # 207
SHARED_LIBS += duktape 1.2 # 207
SHARED_LIBS += duktaped 1.2 # 207
CATEGORIES = lang
@ -26,12 +28,10 @@ MAKE_FILE = Makefile.sharedlibrary
NO_TEST = Yes
do-install:
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/duk ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/src/duk{_config,tape}.h ${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/libduktape.so.${LIBduktape_VERSION} \
${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/duktape
${INSTALL_DATA} ${WRKSRC}/mandel.js ${PREFIX}/share/examples/duktape
find ${PREFIX}/lib -type l -delete
.include <bsd.port.mk>

17
lang/duktape/patches/patch-Makefile_sharedlibrary
View File

@ -1,15 +1,7 @@
Index: Makefile.sharedlibrary
--- Makefile.sharedlibrary.orig
+++ Makefile.sharedlibrary
@@ -63,14 +63,14 @@ CC ?= gcc
CC := $(CC)
.PHONY: all
-all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) duktape.pc
+all: libduktape.$(SO_REALNAME_SUFFIX) duktape.pc
# 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
@@ -70,11 +70,11 @@ all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO
# to $INSTALL_PREFIX/include on installation.
libduktape.$(SO_REALNAME_SUFFIX):
@ -18,6 +10,11 @@ Index: Makefile.sharedlibrary
-o $@ $(DUKTAPE_SRCDIR)/duktape.c
libduktaped.$(SO_REALNAME_SUFFIX):
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -g -Wall -Wextra -Wl,$(LD_SONAME_ARG),libduktaped.$(REAL_VERSION) \
-o $@ $(DUKTAPE_SRCDIR)/duktape.c
duktape.pc:
@@ -99,6 +99,6 @@ install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.
mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/include/
cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(DESTDIR)$(INSTALL_PREFIX)/include/
@ -26,5 +23,5 @@ Index: Makefile.sharedlibrary
-duk:
- $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)$(LIBDIR) -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm
+CCOPTS = -I./examples/cmdline -Isrc
+duk: libduktape.$(SO_REALNAME_SUFFIX)
+duk: libduktape.$(SO_REALNAME_SUFFIX)
+ $(CC) $(CCOPTS) -Wall -Wextra ${CFLAGS} -o $@ ./examples/cmdline/duk_cmdline.c -L. -lduktape -lm

2
lang/duktape/pkg/PLIST
View File

@ -2,5 +2,7 @@
include/duk_config.h
include/duktape.h
@lib lib/libduktape.so.${LIBduktape_VERSION}
@lib lib/libduktaped.so.${LIBduktaped_VERSION}
lib/pkgconfig/duktape.pc
share/examples/duktape/
share/examples/duktape/mandel.js