From 30ee23dca468dec6d125d16cd84abfa4747a469e Mon Sep 17 00:00:00 2001 From: Luis Date: Thu, 30 Jun 2022 07:01:00 +0000 Subject: [PATCH] Fixed /usr/local PREFIX --- main/duktape/.pkgfiles | 22 +++++++++----------- main/duktape/Makefile.patch | 40 +++++++++++++++++++++++++++++++++++++ main/duktape/spkgbuild | 16 +++++++-------- 3 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 main/duktape/Makefile.patch diff --git a/main/duktape/.pkgfiles b/main/duktape/.pkgfiles index b26a1fcd5..bf97f8be8 100644 --- a/main/duktape/.pkgfiles +++ b/main/duktape/.pkgfiles @@ -1,18 +1,14 @@ duktape-2.7.0-1 drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/duk_config.h +-rw-r--r-- root/root usr/include/duktape.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libduktape.so -> libduktape.so.207.20700 +lrwxrwxrwx root/root usr/lib/libduktape.so.207 -> libduktape.so.207.20700 +-rwxr-xr-x root/root usr/lib/libduktape.so.207.20700 +lrwxrwxrwx root/root usr/lib/libduktaped.so -> libduktaped.so.207.20700 +lrwxrwxrwx root/root usr/lib/libduktaped.so.207 -> libduktaped.so.207.20700 +-rwxr-xr-x root/root usr/lib/libduktaped.so.207.20700 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/duktape.pc -drwxr-xr-x root/root usr/local/ -drwxr-xr-x root/root usr/local/include/ --rw-r--r-- root/root usr/local/include/duk_config.h --rw-r--r-- root/root usr/local/include/duktape.h -drwxr-xr-x root/root usr/local/lib/ -lrwxrwxrwx root/root usr/local/lib/libduktape.so -> libduktape.so.207.20700 -lrwxrwxrwx root/root usr/local/lib/libduktape.so.207 -> libduktape.so.207.20700 --rwxr-xr-x root/root usr/local/lib/libduktape.so.207.20700 -lrwxrwxrwx root/root usr/local/lib/libduktaped.so -> libduktaped.so.207.20700 -lrwxrwxrwx root/root usr/local/lib/libduktaped.so.207 -> libduktaped.so.207.20700 --rwxr-xr-x root/root usr/local/lib/libduktaped.so.207.20700 -drwxr-xr-x root/root usr/local/lib/pkgconfig/ --rw-r--r-- root/root usr/local/lib/pkgconfig/duktape.pc diff --git a/main/duktape/Makefile.patch b/main/duktape/Makefile.patch new file mode 100644 index 000000000..d55effb65 --- /dev/null +++ b/main/duktape/Makefile.patch @@ -0,0 +1,40 @@ +--- Makefile.sharedlibrary 2022-01-07 22:17:07.428464733 +0000 ++++ Makefile 2022-01-07 22:03:53.498499145 +0000 +@@ -45,7 +45,7 @@ + endif + + # Change to actual path for actual distribution packaging. +-INSTALL_PREFIX = /usr ++INSTALL_PREFIX = /usr/local + + # The 'noline' variant may be more appropriate for some distributions; it + # doesn't have #line directives in the combined source. +@@ -72,18 +72,17 @@ + # Symlinks depend on platform conventions. + .PHONY: install + install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) +- mkdir -p $(DESTDIR)${PREFIX}/lib/ +- mkdir -p ${DESTDIR}${PREFIX}/include +- cp $+ $(DESTDIR)${PREFIX}/lib/ +- rm -f $(DESTDIR)${PREFIX}/lib/libduktape.so $(DESTDIR)${PREFIX}/lib/libduktape.$(SO_SONAME_SUFFIX) +- ln -s libduktape.$(SO_REALNAME_SUFFIX) $(DESTDIR)${PREFIX}/lib/libduktape.so +- ln -s libduktape.$(SO_REALNAME_SUFFIX) $(DESTDIR)${PREFIX}/lib/libduktape.$(SO_SONAME_SUFFIX) +- rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(DESTDIR)${PREFIX}/lib/libduktaped.$(SO_SONAME_SUFFIX) +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(DESTDIR)${PREFIX}/lib/libduktaped.so +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(DESTDIR)${PREFIX}/lib/libduktaped.$(SO_SONAME_SUFFIX) ++ mkdir -p $(INSTALL_PREFIX)/lib/ ++ cp $+ $(INSTALL_PREFIX)/lib/ ++ 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) + mkdir -p $(INSTALL_PREFIX)/include/ +- cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(DESTDIR)${PREFIX}/include/ ++ cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(INSTALL_PREFIX)/include/ + + CCOPTS = -I./examples/cmdline + duk: +- $(CC) $(CCOPTS) -I$(DESTDIR)${PREFIX}/include -L$(DESTDIR)${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 -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm diff --git a/main/duktape/spkgbuild b/main/duktape/spkgbuild index 0ac5550f2..aad04841d 100755 --- a/main/duktape/spkgbuild +++ b/main/duktape/spkgbuild @@ -2,19 +2,19 @@ # homepage : https://duktape.org # depends : setconf - name=duktape version=2.7.0 release=1 -source="https://$name.org/$name-$version.tar.xz duktape.pc" +source="https://$name.org/$name-$version.tar.xz + duktape.pc" build() { cd $name-$version - cp Makefile.sharedlibrary Makefile - make - make PREFIX=/usr DESTDIR=$PKG install - - mkdir -p $PKG/usr/lib/pkgconfig - cp $SRC/$name.pc $PKG/usr/lib/pkgconfig/$name.pc + make -f ./Makefile.sharedlibrary + + make -f ./Makefile.sharedlibrary install INSTALL_PREFIX=$PKG/usr + + mkdir -p $PKG/usr/lib/pkgconfig/ + sed "s/@VERSION@/$version/" "$SRC/$name.pc" > "$PKG/usr/lib/pkgconfig/$name.pc" }