| 1 |
jlec 10/06/24 14:46:48 |
| 2 |
|
| 3 |
Added: ogdi-3.1.6-unbundle-libs.patch |
| 4 |
ogdi-3.1.6-fpic.patch |
| 5 |
Log: |
| 6 |
Version Bump, hopefully fixing bug 264724 |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ogdi-3.1.6-unbundle-libs.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/makefile b/makefile |
| 18 |
index 8c62a03..3ecb0f0 100644 |
| 19 |
--- a/makefile |
| 20 |
+++ b/makefile |
| 21 |
@@ -17,7 +17,7 @@ include $(TOPDIR)/config/common.mak |
| 22 |
# |
| 23 |
# Sub-directories that need to be built |
| 24 |
# |
| 25 |
-subdirs = external vpflib ogdi contrib |
| 26 |
+subdirs = vpflib ogdi contrib |
| 27 |
|
| 28 |
ifneq ($(PROJ_SETTING),external) |
| 29 |
subdirs := proj $(subdirs) |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: ogdi-3.1.6-fpic.patch |
| 39 |
=================================================================== |
| 40 |
diff --git a/config/generic.mak.in b/config/generic.mak.in |
| 41 |
index 1cb74f5..2e9cabe 100644 |
| 42 |
--- a/config/generic.mak.in |
| 43 |
+++ b/config/generic.mak.in |
| 44 |
@@ -35,16 +35,16 @@ AR = ar cr |
| 45 |
# Compilation and linking flags |
| 46 |
# |
| 47 |
SHLIB_CFLAGS = @C_PIC@ |
| 48 |
-COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 |
| 49 |
+COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ |
| 50 |
|
| 51 |
-SHLIB_LDFLAGS = -shared |
| 52 |
-COMMON_LDFLAGS = $(OPTIMIZATION) |
| 53 |
+SHLIB_LDFLAGS = -shared -Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) |
| 54 |
+COMMON_LDFLAGS = $(OPTIMIZATION) $(LDFLAGS) |
| 55 |
|
| 56 |
RPC_INCLUDES = @RPC_INCLUDES@ |
| 57 |
|
| 58 |
UCB_STATICLIB = |
| 59 |
|
| 60 |
-TCL_INCLUDE = -I/usr/include/tcl8.3 |
| 61 |
+TCL_INCLUDE = -I${prefix}/include |
| 62 |
TCL_LINKLIB = |
| 63 |
|
| 64 |
# |
| 65 |
diff --git a/config/unix.mak b/config/unix.mak |
| 66 |
index e3af578..927b0fc 100644 |
| 67 |
--- a/config/unix.mak |
| 68 |
+++ b/config/unix.mak |
| 69 |
@@ -55,7 +55,7 @@ LINK_SW = -L |
| 70 |
ifeq ($(CFG),debug) |
| 71 |
OPTIMIZATION = -g |
| 72 |
else |
| 73 |
-OPTIMIZATION = -O |
| 74 |
+OPTIMIZATION = |
| 75 |
endif |
| 76 |
|
| 77 |
# |
Archives