summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2011-12-17 16:09:41 +0000
committerRalph Sennhauser <sera@gentoo.org>2011-12-17 16:09:41 +0000
commit8e6fa178188599be24326d52dd22430805906d51 (patch)
treed9d9797a0ecaabf5272791b7e9d053a290541415 /dev-java/charva/files
parentcosmetics (diff)
downloadgentoo-2-8e6fa178188599be24326d52dd22430805906d51.tar.gz
gentoo-2-8e6fa178188599be24326d52dd22430805906d51.tar.bz2
gentoo-2-8e6fa178188599be24326d52dd22430805906d51.zip
Bump EAPI.
Restrict tests. #314131 Respect C/LDFLAGS, don't call gcc directly. #337313 Add missing DEPEND on app-arch/unzip #371479 (Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/charva/files')
-rw-r--r--dev-java/charva/files/charva-respect-flags.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/dev-java/charva/files/charva-respect-flags.patch b/dev-java/charva/files/charva-respect-flags.patch
new file mode 100644
index 000000000000..73d09e9a265e
--- /dev/null
+++ b/dev-java/charva/files/charva-respect-flags.patch
@@ -0,0 +1,27 @@
+--- c/src/Makefile.linux.txt
++++ c/src/Makefile.linux.txt
+@@ -5,14 +5,14 @@
+ SHARED_OBJECT_EXT = so
+ TARGET = libTerminal.${SHARED_OBJECT_EXT}
+
+-CC = gcc
++CC ?= gcc
+ # "-D_USE_NCURSESW" was added for handling UTF-8 characters (contributed by Leos Urban)
+-CFLAGS = -fpic -shared -D_USE_NCURSESW_
++CFLAGS += -fpic -shared -D_USE_NCURSESW_
+
+ # The file "jni.h" is in ${JAVA_HOME}/include
+ # The file "jni_md.h" (included from jni.h) contains machine-dependent
+ # type definitions and is in ${JAVA_HOME}/include/${OS}
+-INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include
++INCLUDES ?= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include
+
+ # Changed "-lncurses" to "-lncursesw" (Leos Urban)
+ LIBS = -lncursesw
+@@ -21,5 +21,5 @@
+ all : ${TARGET}
+
+ ${TARGET} : Toolkit.c ../include/charva_awt_Toolkit.h Makefile.${OS}.txt
+- ${CC} ${CFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}
++ ${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}
+