tokyocabinet/tokyocabinet-fedora.patch

55 lines
2.0 KiB
Diff
Raw Normal View History

2009-12-17 20:21:50 +00:00
--- configure.in 2009-12-06 21:43:11.000000000 -0500
+++ configure.in.new 2009-12-17 15:13:58.794592478 -0500
2009-06-03 20:07:24 +00:00
@@ -31,26 +31,15 @@
2007-11-29 22:34:36 +00:00
MYPCFILES="tokyocabinet.pc"
# Building flags
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
2009-03-04 01:29:53 +00:00
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
2007-11-29 22:34:36 +00:00
-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
+MYLDFLAGS="-L. -L\$(LIBDIR)"
2009-01-13 23:31:55 +00:00
MYCMDLDFLAGS=""
2007-11-29 22:34:36 +00:00
MYRUNPATH="\$(LIBDIR)"
MYLDLIBPATHENV="LD_LIBRARY_PATH"
MYPOSTCMD="true"
-# Building paths
2009-06-03 20:07:24 +00:00
-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"
2009-01-13 23:31:55 +00:00
-CPATH="$HOME/include:/usr/local/include:$CPATH"
2007-11-29 22:34:36 +00:00
-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"
2009-01-13 23:31:55 +00:00
-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
2007-11-29 22:34:36 +00:00
-
-
-
#================================================================
# Options
#================================================================
2009-12-17 20:21:50 +00:00
--- Makefile.in 2009-10-13 08:33:20.000000000 -0400
+++ Makefile.in.new 2009-12-17 15:15:07.257604314 -0500
2009-01-13 23:31:55 +00:00
@@ -54,8 +54,8 @@
2007-11-29 22:34:36 +00:00
LDFLAGS = @MYLDFLAGS@
2009-01-13 23:31:55 +00:00
CMDLDFLAGS = @MYCMDLDFLAGS@
2007-11-29 22:34:36 +00:00
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@
2009-08-28 22:02:25 +00:00
+LDENV =
2007-11-29 22:34:36 +00:00
+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
POSTCMD = @MYPOSTCMD@
2009-01-13 23:31:55 +00:00
--- tokyocabinet.pc.in 2008-02-18 02:25:18.000000000 -0500
2009-12-17 20:21:50 +00:00
+++ tokyocabinet.pc.in.new 2009-12-17 15:15:29.626591709 -0500
2009-01-13 23:31:55 +00:00
@@ -10,5 +10,5 @@
2007-11-29 22:34:36 +00:00
Name: Tokyo Cabinet
Description: a modern implementation of DBM
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ltokyocabinet @LIBS@
+Libs: -L${libdir} -ltokyocabinet
Cflags: -I${includedir}