libs/tokyocabinet/patches/100-remove_extra_paths_from_configure.patch

   1 diff -ru tokyocabinet-1.4.47/configure tokyocabinet-1.4.47-new/configure
   2 --- tokyocabinet-1.4.47/configure       2011-02-11 10:59:53.000000000 +0100
   3 +++ tokyocabinet-1.4.47-new/configure   2011-06-01 16:54:33.082157954 +0200
   4 @@ -2066,24 +2066,14 @@
   5
   6  # Building flags
   7  MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
   8 -MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
   9 +MYCPPFLAGS="-I."
  10  MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
  11 -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
  12 +MYLDFLAGS="-L."
  13  MYCMDLDFLAGS=""
  14  MYRUNPATH="\$(LIBDIR)"
  15  MYLDLIBPATHENV="LD_LIBRARY_PATH"
  16  MYPOSTCMD="true"
  17
  18 -# Building paths
  19 -PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
  20 -PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
  21 -CPATH="$HOME/include:/usr/local/include:$CPATH"
  22 -LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
  23 -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
  24 -PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
  25 -export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
  26 -
  27 -
  28
  29  #================================================================
  30  # Options
  31 diff -ru tokyocabinet-1.4.47/configure.in tokyocabinet-1.4.47-new/configure.in
  32 --- tokyocabinet-1.4.47/configure.in    2010-08-15 16:14:53.000000000 +0200
  33 +++ tokyocabinet-1.4.47-new/configure.in        2011-06-01 16:53:34.645989924 +0200
  34 @@ -32,25 +32,14 @@
  35
  36  # Building flags
  37  MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
  38 -MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
  39 +MYCPPFLAGS="-I."
  40  MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
  41 -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
  42 +MYLDFLAGS="-L."
  43  MYCMDLDFLAGS=""
  44  MYRUNPATH="\$(LIBDIR)"
  45  MYLDLIBPATHENV="LD_LIBRARY_PATH"
  46  MYPOSTCMD="true"
  47
  48 -# Building paths
  49 -PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
  50 -PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
  51 -CPATH="$HOME/include:/usr/local/include:$CPATH"
  52 -LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
  53 -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
  54 -PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
  55 -export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
  56 -
  57 -
  58 -
  59  #================================================================
  60  # Options
  61  #================================================================
  62 diff -ru tokyocabinet-1.4.47/Makefile.in tokyocabinet-1.4.47-new/Makefile.in
  63 --- tokyocabinet-1.4.47/Makefile.in     2010-07-04 10:36:20.000000000 +0200
  64 +++ tokyocabinet-1.4.47-new/Makefile.in 2011-06-01 15:02:19.383826342 +0200
  65 @@ -54,8 +54,8 @@
  66  LDFLAGS = @MYLDFLAGS@
  67  CMDLDFLAGS = @MYCMDLDFLAGS@
  68  LIBS = @LIBS@
  69 -LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
  70 -RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
  71 +LDENV = LD_RUN_PATH=$(LIBDIR):@MYRUNPATH@:.
  72 +RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR):@MYRUNPATH@
  73  POSTCMD = @MYPOSTCMD@
  74
  75