summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <sudinave@gmail.com>2020-11-24 16:27:53 -0500
committerSam James <sam@gentoo.org>2020-11-24 21:39:51 +0000
commitfe4a48240576cba047811227db08e26bdf680b8b (patch)
treea17ecb159f73879e5f2b98918ba425b43b2bb0f2 /dev-lang
parentkde-frameworks/kdelibs4support: Drop 5.76.0 (r0) (diff)
downloadgentoo-fe4a48240576cba047811227db08e26bdf680b8b.tar.gz
gentoo-fe4a48240576cba047811227db08e26bdf680b8b.tar.bz2
gentoo-fe4a48240576cba047811227db08e26bdf680b8b.zip
dev-lang/duktape: fix respect-tc-env patch
Closes: https://bugs.gentoo.org/756367 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Ionen Wolkens <sudinave@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/duktape/duktape-2.6.0.ebuild4
-rw-r--r--dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch12
2 files changed, 8 insertions, 8 deletions
diff --git a/dev-lang/duktape/duktape-2.6.0.ebuild b/dev-lang/duktape/duktape-2.6.0.ebuild
index 44af7070693..1037f1a821b 100644
--- a/dev-lang/duktape/duktape-2.6.0.ebuild
+++ b/dev-lang/duktape/duktape-2.6.0.ebuild
@@ -20,6 +20,8 @@ PATCHES=(
)
src_prepare() {
+ default
+
# Set install path
sed -i "s#INSTALL_PREFIX = /usr/local#INSTALL_PREFIX = ${ED}/usr#" \
Makefile.sharedlibrary || die "failed to set install path"
@@ -33,8 +35,6 @@ src_prepare() {
Makefile.sharedlibrary || die
mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
-
- default
}
src_compile() {
diff --git a/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch b/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch
index ab58e7f9a6d..cb92d0ab8d3 100644
--- a/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch
+++ b/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch
@@ -1,8 +1,8 @@
-diff --git a/Makefile b/Makefile
+diff --git a/Makefile.sharedlibrary b/Makefile.sharedlibrary
index 156ea96..a0997b1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -52,7 +52,7 @@ INSTALL_PREFIX = /var/tmp/portage/dev-lang/duktape-2.6.0/image/usr
+--- a/Makefile.sharedlibrary
++++ b/Makefile.sharedlibrary
+@@ -52,7 +52,7 @@ INSTALL_PREFIX = /usr/local
DUKTAPE_SRCDIR = ./src
#DUKTAPE_SRCDIR = ./src-noline
@@ -29,5 +29,5 @@ index 156ea96..a0997b1 100644
CCOPTS = -I./examples/cmdline
duk:
-- $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib64 -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm
-+ $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib64 ${CFLAGS} -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
++ $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib ${CFLAGS} -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm