diff --git a/dev-lang/duktape/duktape-2.6.0.recipe b/dev-lang/duktape/duktape-2.6.0.recipe index ef767417d..a4be85eea 100644 --- a/dev-lang/duktape/duktape-2.6.0.recipe +++ b/dev-lang/duktape/duktape-2.6.0.recipe @@ -3,11 +3,12 @@ DESCRIPTION="Duktape is a small and portable ECMAScript E5/E5.1 \ implementation. It isintended to be easily embeddable into C programs, with \ a C API similar in spirit to Lua's." HOMEPAGE="https://duktape.org/" -COPYRIGHT="2013-2019 Duktape authors" +COPYRIGHT="2013-present Duktape authors" LICENSE="MIT" -REVISION="1" +REVISION="2" SOURCE_URI="https://duktape.org/duktape-${portVersion}.tar.xz" CHECKSUM_SHA256="96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7" +PATCHES="duktape-$portVersion.patchset" libVersion="206.20600" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" @@ -46,26 +47,20 @@ defineDebugInfoPackage duktape$secondaryArchSuffix \ $libDir/libduktape.so.$libVersion \ $libDir/libduktaped.so.$libVersion -PATCH() -{ - # Set install path - sed -i "s#INSTALL_PREFIX = /usr/local#INSTALL_PREFIX = $prefix#" \ - Makefile.sharedlibrary || die "failed to set install path" - - mv Makefile.sharedlibrary Makefile || die "failed to rename makefile" -} - BUILD() { - make $jobArgs + mv Makefile.sharedlibrary Makefile || die "failed to rename makefile" + + make INSTALL_PREFIX=$prefix \ + INCLUDEDIR=$includeDir \ + LIBDIR=$libDir $jobArgs } INSTALL() { - make install $jobArgs - mkdir -p $includeDir - mv $prefix/include/* $includeDir - rmdir $prefix/include/ + make INSTALL_PREFIX=$prefix \ + INCLUDEDIR=$includeDir \ + LIBDIR=$libDir install prepareInstalledDevelLibs libduktape libduktaped fixPkgconfig diff --git a/dev-lang/duktape/patches/duktape-2.6.0.patchset b/dev-lang/duktape/patches/duktape-2.6.0.patchset new file mode 100644 index 000000000..9d3169c82 --- /dev/null +++ b/dev-lang/duktape/patches/duktape-2.6.0.patchset @@ -0,0 +1,51 @@ +From ea895bae94957d97e12c6bcda34b72afe8506808 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 21 Feb 2021 12:52:27 +0000 +Subject: duktape, fix installation paths + + +diff --git a/Makefile.sharedlibrary b/Makefile.sharedlibrary +index e7d365f..a79f19e 100644 +--- a/Makefile.sharedlibrary ++++ b/Makefile.sharedlibrary +@@ -46,6 +46,8 @@ endif + + # Change to actual path for actual distribution packaging. + INSTALL_PREFIX = /usr/local ++INCLUDEDIR = $(INSTALL_PREFIX)/include ++LIBDIR = $(INSTALL_PREFIX)/lib + + # The 'noline' variant may be more appropriate for some distributions; it + # doesn't have #line directives in the combined source. +@@ -72,17 +74,17 @@ libduktaped.$(SO_REALNAME_SUFFIX): + # Symlinks depend on platform conventions. + .PHONY: install + install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_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 $(INSTALL_PREFIX)/include/ ++ mkdir -p $(LIBDIR)/ ++ cp $+ $(LIBDIR)/ ++ rm -f $(LIBDIR)/libduktape.so $(LIBDIR)/libduktape.$(SO_SONAME_SUFFIX) ++ ln -s libduktape.$(SO_REALNAME_SUFFIX) $(LIBDIR)/libduktape.so ++ ln -s libduktape.$(SO_REALNAME_SUFFIX) $(LIBDIR)/libduktape.$(SO_SONAME_SUFFIX) ++ rm -f $(LIBDIR)/libduktaped.so $(LIBDIR)/libduktaped.$(SO_SONAME_SUFFIX) ++ ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(LIBDIR)/libduktaped.so ++ ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(LIBDIR)/libduktaped.$(SO_SONAME_SUFFIX) ++ mkdir -p $(INCLUDEDIR)/ ++ cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(INCLUDEDIR)/ + + 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$(INCLUDEDIR) -L$(LIBDIR) -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm +-- +2.30.0 +