diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-04-29 14:31:00 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-04-29 14:31:00 +0000 |
| commit | 1867aef3f657e6dd127d4e71eb89a1317c4796d1 (patch) | |
| tree | 7152679e3b9e50c42da0c9adad822357df3caf2b /www-servers/resin/files | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-1867aef3f657e6dd127d4e71eb89a1317c4796d1.tar.gz gentoo-2-1867aef3f657e6dd127d4e71eb89a1317c4796d1.tar.bz2 gentoo-2-1867aef3f657e6dd127d4e71eb89a1317c4796d1.zip | |
added patch to fix #90003. patch also corrects fpic issue for a shared object.
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-servers/resin/files')
| -rw-r--r-- | www-servers/resin/files/3.0.12/gentoo.diff | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/www-servers/resin/files/3.0.12/gentoo.diff b/www-servers/resin/files/3.0.12/gentoo.diff new file mode 100644 index 000000000000..1e258a2b0524 --- /dev/null +++ b/www-servers/resin/files/3.0.12/gentoo.diff @@ -0,0 +1,25 @@ +--- ../resin-3.0.12/configure 2005-01-12 00:00:26.000000000 +0100 ++++ configure 2005-04-29 16:18:15.000000000 +0200 +@@ -8261,6 +8261,10 @@ + apache_exe="${apache_bin}/httpd" + elif test -x "${apache_bin}/httpd2"; then + apache_exe="${apache_bin}/httpd2" ++elif test -x "${apache_bin}/apache"; then ++ apache_exe="${apache_bin}/apache" ++elif test -x "${apache_bin}/apache2"; then ++ apache_exe="${apache_bin}/apache2" + else + { { echo "$as_me:$LINENO: error: Can't find Apache binary in directory ${apache_bin}" >&5 + echo "$as_me: error: Can't find Apache binary in directory ${apache_bin}" >&2;} +diff -uprN ../resin-3.0.12/src/c/resin_os/Makefile.in src/c/resin_os/Makefile.in +--- ../resin-3.0.12/src/c/resin_os/Makefile.in 2004-12-01 00:22:38.000000000 +0100 ++++ src/c/resin_os/Makefile.in 2005-04-29 16:24:36.000000000 +0200 +@@ -13,7 +13,7 @@ resin_libexec=@apache_libexec@ + resin_home=@resin_home@ + JNI_INCLUDE=@JNI_INCLUDE@ + INCLUDES = @INCLUDES@ $(JNI_INCLUDE) -I../common +-CFLAGS = @CFLAGS@ -DRESIN_HOME=\"$(resin_home)\" $(INCLUDES) -DCPU=\"$(CPU)\" -DOS=$(OS) ++CFLAGS = @CFLAGS@ -fPIC -DRESIN_HOME=\"$(resin_home)\" $(INCLUDES) -DCPU=\"$(CPU)\" -DOS=$(OS) + OBJ= jni_os.o + + all : libresin_os.$(SO) |