| 1 |
patrick 10/11/24 15:08:15 |
| 2 |
|
| 3 |
Added: fix_rpath-1.2.4.patch remove_ldconfig-1.2.4.patch |
| 4 |
Log: |
| 5 |
Bump for #331557 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/kyotocabinet/files/fix_rpath-1.2.4.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: fix_rpath-1.2.4.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Makefile.in b/Makefile.in |
| 18 |
index 4ac046d..c757dfa 100644 |
| 19 |
--- a/Makefile.in |
| 20 |
+++ b/Makefile.in |
| 21 |
@@ -53,8 +53,8 @@ CXXFLAGS = @MYCXXFLAGS@ |
| 22 |
LDFLAGS = @MYLDFLAGS@ |
| 23 |
CMDLDFLAGS = @MYCMDLDFLAGS@ |
| 24 |
LIBS = @LIBS@ |
| 25 |
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ |
| 26 |
-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ |
| 27 |
+LDENV = |
| 28 |
+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) |
| 29 |
POSTCMD = @MYPOSTCMD@ |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/configure.in b/configure.in |
| 33 |
index ad63005..f0448d6 100644 |
| 34 |
--- a/configure.in |
| 35 |
+++ b/configure.in |
| 36 |
@@ -34,27 +34,17 @@ MYDOCUMENTFILES="COPYING ChangeLog doc kyotocabinet.idl" |
| 37 |
MYPCFILES="kyotocabinet.pc" |
| 38 |
|
| 39 |
# Building flags |
| 40 |
-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -O2" |
| 41 |
+MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char" |
| 42 |
MYCXXFLAGS="-Wall -fPIC -fsigned-char -O2" |
| 43 |
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" |
| 44 |
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" |
| 45 |
MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1" |
| 46 |
MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__" |
| 47 |
-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" |
| 48 |
+MYLDFLAGS="-L. -L\$(LIBDIR)" |
| 49 |
MYCMDLDFLAGS="" |
| 50 |
MYRUNPATH="\$(LIBDIR)" |
| 51 |
MYLDLIBPATHENV="LD_LIBRARY_PATH" |
| 52 |
MYPOSTCMD="true" |
| 53 |
|
| 54 |
-# Building paths |
| 55 |
-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" |
| 56 |
-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" |
| 57 |
-CPATH="$HOME/include:/usr/local/include:$CPATH" |
| 58 |
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" |
| 59 |
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" |
| 60 |
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" |
| 61 |
-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH |
| 62 |
- |
| 63 |
- |
| 64 |
|
| 65 |
#================================================================ |
| 66 |
# Options |
| 67 |
diff --git a/kyotocabinet.pc.in b/kyotocabinet.pc.in |
| 68 |
index f21c87b..718f2d8 100644 |
| 69 |
--- a/kyotocabinet.pc.in |
| 70 |
+++ b/kyotocabinet.pc.in |
| 71 |
@@ -10,5 +10,5 @@ datadir=@datadir@ |
| 72 |
Name: Kyoto Cabinet |
| 73 |
Description: another modern implementation of DBM |
| 74 |
Version: @PACKAGE_VERSION@ |
| 75 |
-Libs: -L${libdir} -lkyotocabinet @LIBS@ |
| 76 |
+Libs: -L${libdir} -lkyotocabinet |
| 77 |
Cflags: -I${includedir} |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.1 dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch?rev=1.1&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/kyotocabinet/files/remove_ldconfig-1.2.4.patch?rev=1.1&content-type=text/plain |
| 85 |
|
| 86 |
Index: remove_ldconfig-1.2.4.patch |
| 87 |
=================================================================== |
| 88 |
diff --git a/Makefile.in b/Makefile.in |
| 89 |
index 6754032..b1f9055 100644 |
| 90 |
--- a/Makefile.in |
| 91 |
+++ b/Makefile.in |
| 92 |
@@ -123,7 +123,6 @@ install : |
| 93 |
cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR) |
| 94 |
mkdir -p $(DESTDIR)$(PCDIR) |
| 95 |
cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR) |
| 96 |
- -[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig 2>/dev/null || true |
| 97 |
@printf '\n' |
| 98 |
@printf '#================================================================\n' |
| 99 |
@printf '# Thanks for using Kyoto Cabinet.\n' |
Archives