File tokyocabinet-fix_library_paths.patch of Package tokyocabinet

Overview Repositories Revisions Requests Users Attributes Meta

File tokyocabinet-fix_library_paths.patch of Package tokyocabinet

--- example/Makefile.orig	2009-09-07 14:13:00.000000000 +0200
+++ example/Makefile	2009-09-07 14:13:26.000000000 +0200
@@ -15,11 +15,12 @@
 
 # Building binaries
 CC = gcc
-CFLAGS = -I. -I.. -ansi -Wall -pedantic -fsigned-char -O2
-C99FLAGS = -I. -I.. -std=c99 -Wall -pedantic -fsigned-char -O2
+OPTFLAGS = -O2
+CFLAGS = -I. -I.. -ansi -Wall -pedantic -fsigned-char $(OPTFLAGS)
+C99FLAGS = -I. -I.. -std=c99 -Wall -pedantic -fsigned-char $(OPTFLAGS)
 LDFLAGS =
 LIBS = -L. -L.. -ltokyocabinet -lz -lbz2 -lpthread -lm -lc
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:.:..
+LDENV = 
 
 
 
--- Makefile.in.orig	2009-09-07 14:13:28.000000000 +0200
+++ Makefile.in	2009-09-07 14:13:57.000000000 +0200
@@ -54,8 +54,8 @@
 LDFLAGS = @MYLDFLAGS@
 CMDLDFLAGS = @MYCMDLDFLAGS@
 LIBS = @LIBS@
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
+LDENV = 
+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
 POSTCMD = @MYPOSTCMD@
 
 
--- configure.in.orig	2009-09-07 14:14:01.000000000 +0200
+++ configure.in	2009-09-07 14:17:41.000000000 +0200
@@ -31,22 +31,17 @@
 MYPCFILES="tokyocabinet.pc"
 
 # Building flags
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
-MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char ${OPTFLAGS}"
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
+MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__ ${OPTFLAGS}"
+MYLDFLAGS="-L. -L\$(LIBDIR)"
 MYCMDLDFLAGS=""
 MYRUNPATH="\$(LIBDIR)"
 MYLDLIBPATHENV="LD_LIBRARY_PATH"
 MYPOSTCMD="true"
 
 # Building paths
-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
 
 
@@ -64,7 +59,7 @@
   AC_HELP_STRING([--enable-debug], [build for debugging]))
 if test "$enable_debug" = "yes"
 then
-  MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -g -O0"
+  MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char ${OPTFLAGS}"
   MYCPPFLAGS="$MYCPPFLAGS -UNDEBUG"
   MYCMDLDFLAGS="$MYCMDLDFLAGS -static"
   enables="$enables (debug)"
@@ -75,7 +70,7 @@
   AC_HELP_STRING([--enable-devel], [build for development]))
 if test "$enable_devel" = "yes"
 then
-  MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -g -O2 -pipe"
+  MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char ${OPTFLAGS} -pipe"
   MYCPPFLAGS="$MYCPPFLAGS -UNDEBUG"
   enables="$enables (devel)"
 fi
@@ -104,7 +99,7 @@
 if test "$enable_fastest" = "yes"
 then
   MYLIBOBJFILES="tokyocabinet_all.o"
-  MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char -O3"
+  MYCFLAGS="-std=c99 -Wall -fPIC -pedantic -fsigned-char ${OPTFLAGS}"
   MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops"
   MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST"
   enables="$enables (fastest)"

Places

File tokyocabinet-fix_library_paths.patch of Package tokyocabinet

Places