diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-07-16 23:20:29 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-07-16 23:20:29 +0000 |
| commit | 0af2e5a53a217f4104286c0d8348ea2173f55f5e (patch) | |
| tree | faddb54c6e32e70331d4228abe649392d35be377 /app-crypt/rotix/files | |
| parent | Stable on amd64 wrt bug #328485 (diff) | |
| download | gentoo-2-0af2e5a53a217f4104286c0d8348ea2173f55f5e.tar.gz gentoo-2-0af2e5a53a217f4104286c0d8348ea2173f55f5e.tar.bz2 gentoo-2-0af2e5a53a217f4104286c0d8348ea2173f55f5e.zip | |
Apply patch from Dane Smith to fix compilation problems with USE=nls and -O0. Bug #239964. Respect LDFLAGS and drop custom CFLAGS for debug mode
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/rotix/files')
| -rw-r--r-- | app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch | 26 | ||||
| -rw-r--r-- | app-crypt/rotix/files/rotix-0.83-locale.diff | 10 |
2 files changed, 27 insertions, 9 deletions
diff --git a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch b/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch index 85498d2e03af..ab23372e768f 100644 --- a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch +++ b/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch @@ -1,23 +1,31 @@ ---- Makefile.orig 2007-03-21 22:43:39.000000000 +0100 -+++ Makefile 2007-03-21 22:44:16.000000000 +0100 -@@ -24,8 +24,6 @@ +Index: rotix-0.83/Makefile +=================================================================== +--- rotix-0.83.orig/Makefile ++++ rotix-0.83/Makefile +@@ -22,12 +22,6 @@ - ifdef DEBUG - CFLAGS += -g3 + include Makefile.settings + +-ifdef DEBUG +-CFLAGS += -g3 -else -CFLAGS += -O3 - endif - +-endif +- ifdef I18N -@@ -40,11 +38,6 @@ + CFLAGS += -DPACKAGE=\"${PACKAGE}\" -D LOCALEDIR=\"${LOCALE}\" + endif +@@ -39,12 +33,7 @@ endif + all : rotix po rotix : rot.o help.o rotix.o - $(CC) -Wall $(CFLAGS) -o rotix rot.o help.o rotix.o +- $(CC) -Wall $(CFLAGS) -o rotix rot.o help.o rotix.o -ifdef STRIP -ifndef DEBUG - $(STRIP) rotix -endif -endif ++ $(CC) -Wall $(CFLAGS) $(LDFLAGS) -o rotix rot.o help.o rotix.o ifdef I18N CFLAGS += -D I18N=1 diff --git a/app-crypt/rotix/files/rotix-0.83-locale.diff b/app-crypt/rotix/files/rotix-0.83-locale.diff new file mode 100644 index 000000000000..844a452b8af1 --- /dev/null +++ b/app-crypt/rotix/files/rotix-0.83-locale.diff @@ -0,0 +1,10 @@ +--- rotix.c 2002-04-02 14:48:42.000000000 -0500 ++++ rotix.c.mine 2010-07-15 14:54:45.000000000 -0400 +@@ -38,6 +38,7 @@ + /* I18N */ + #ifdef I18N + #include <libintl.h> ++#include <locale.h> + #define _(String) gettext (String) + #else + #define _(String) String |