/[gentoo-x86]/sci-libs/libcore/files/libcore-1.7.patch
Gentoo

Contents of /sci-libs/libcore/files/libcore-1.7.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download) (as text)
Mon Feb 2 23:01:37 2009 UTC (11 years ago) by bicatali
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +4 -15 lines
File MIME type: text/x-diff
Version bump, now propagates flags properly and backport changes to 1.7
(Portage version: 2.2_rc23/cvs/Linux x86_64)

1 --- src/Makefile 2004-11-11 19:10:53.000000000 +0100
2 +++ src/Makefile 2006-10-12 20:25:40.000000000 +0200
3 @@ -7,7 +7,7 @@
4
5 CORE_PATH=..
6
7 -INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include
8 +INCLUDE=-I${CORE_PATH}/inc
9
10 # VAR indicates variants of the Core library
11 # E.g., if VAR=(empty) then we compile the release version.
12 @@ -31,7 +31,8 @@
13
14 # The following library will be built:
15 CORE_LIB=$(CORE_PATH)/lib/libcore++${VAR}.a
16 -CORE_SHARED_LIB=$(CORE_PATH)/lib/libcore++${VAR}.so
17 +CORE_SHARED_LIB_NAME=libcore++${VAR}.so
18 +CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME)
19
20 TARGET=$(CORE_LIB)
21
22 @@ -49,7 +50,7 @@
23 $(AR) $@ $?
24
25 ${CORE_SHARED_LIB}: $(EXPROBJS)
26 - $(CXX) $(CORE_LDFLAGS) -o $@ $^
27 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME).1 -o $@ $^
28
29 %${VAR}.o: %.cpp
30 # Aug 8, 2004 by Chee (TEMP CHANGE! FOR DEBUGGING)
31 --- ext/Makefile 2004-11-11 19:10:55.000000000 +0100
32 +++ ext/Makefile 2006-10-12 20:26:00.000000000 +0200
33 @@ -13,7 +13,7 @@
34 # =============================================================
35
36 CORE_PATH=..
37 -INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include
38 +INCLUDE=-I${CORE_PATH}/inc
39
40 MODULES := linearAlgebra geometry2d geometry3d
41
42 @@ -29,9 +29,12 @@
43 COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a
44 COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a
45 COREX_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.a
46 -COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.so
47 -COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.so
48 -COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.so
49 +COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.so
50 +COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.so
51 +COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.so
52 +COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL3_NAME)
53 +COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL2_NAME)
54 +COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL1_NAME)
55
56 TARGET=${COREX_LIB_LEVEL3} ${COREX_LIB_LEVEL2} ${COREX_LIB_LEVEL1}
57
58 @@ -59,7 +62,7 @@
59
60 ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS}
61 -@rm -rf $@
62 - $(CXX) $(CORE_LDFLAGS) -o $@ $?
63 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME).1 -o $@ $?
64
65 ${COREX_LIB_LEVEL2}: ${L2_OBJS}
66 -@rm -rf $@
67 @@ -67,7 +70,7 @@
68
69 ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS}
70 -@rm -rf $@
71 - $(CXX) $(CORE_LDFLAGS) -o $@ $?
72 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME).1 -o $@ $?
73
74 ${COREX_LIB_LEVEL1}: ${L1_OBJS}
75 -@rm -rf $@
76 @@ -75,16 +78,16 @@
77
78 ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS}
79 -@rm -rf $@
80 - $(CXX) $(CORE_LDFLAGS) -o $@ $?
81 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME).1 -o $@ $?
82
83 %_level3.o: %.cpp
84 - ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
85 + ${CXX} -ffriend-injection -fpermissive $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
86
87 %_level2.o: %.cpp
88 - ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=2 $(INCLUDE) -c $< -o $@
89 + ${CXX} -ffriend-injection -fpermissive $(CORE_CXXFLAGS) -DCORE_LEVEL=2 $(INCLUDE) -c $< -o $@
90
91 %_level1.o: %.cpp
92 - ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=1 $(INCLUDE) -c $< -o $@
93 + ${CXX} -ffriend-injection -fpermissive $(CORE_CXXFLAGS) -DCORE_LEVEL=1 $(INCLUDE) -c $< -o $@
94
95 clean:
96 -@test -z "*.o" || rm -f *.o

  ViewVC Help
Powered by ViewVC 1.1.20