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

Contents of /sci-libs/libcore/files/libcore-2.0.8-makefiles.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Thu Aug 13 00:28:42 2009 UTC (10 years, 6 months ago) by bicatali
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Version bump. Serious ebuild cleaning and added tests.
(Portage version: 2.2_rc38/cvs/Linux x86_64)

1 --- src/Makefile.orig 2009-08-12 22:52:51.000000000 +0100
2 +++ src/Makefile 2009-08-12 23:38:51.000000000 +0100
3 @@ -7,7 +7,7 @@
4
5 CORE_PATH=..
6
7 -INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/mpfr/include -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 @@ -37,12 +37,13 @@
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.2.0.0
18 +CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME)
19
20 TARGET=$(CORE_LIB)
21
22 ifeq (${LINKAGE}, shared)
23 - TARGET+=$(CORE_SHARED_LIB)
24 + TARGET=$(CORE_SHARED_LIB)
25 endif
26
27 # =============================================================
28 @@ -55,7 +56,7 @@
29 $(AR) $@ $^
30
31 ${CORE_SHARED_LIB}: $(EXPROBJS)
32 - $(CXX) $(CORE_LDFLAGS) -o $@ $^
33 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME).2.0.0 -o $@ $^ $(LIBS)
34
35 %${VAR}.o: %.cpp
36 ${CXX} $(CORE_CXXFLAGS) $(INCLUDE) -c $< -o $@
37 --- ext/Makefile.orig 2009-08-12 22:54:55.000000000 +0100
38 +++ ext/Makefile 2009-08-12 23:39:19.000000000 +0100
39 @@ -13,8 +13,7 @@
40 # =============================================================
41
42 CORE_PATH=..
43 -INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include \
44 - -I${CORE_PATH}/mpfr/include
45 +INCLUDE=-I${CORE_PATH}/inc
46
47 MODULES := linearAlgebra geometry2d geometry3d
48
49 @@ -30,14 +29,17 @@
50 COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a
51 COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a
52 COREX_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.a
53 -COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.so
54 -COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.so
55 -COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.so
56 +COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.so.2.0.0
57 +COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.so.2.0.0
58 +COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.so.2.0.0
59 +COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL3_NAME)
60 +COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL2_NAME)
61 +COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL1_NAME)
62
63 TARGET=${COREX_LIB_LEVEL3} ${COREX_LIB_LEVEL2} ${COREX_LIB_LEVEL1}
64
65 ifeq (${LINKAGE}, shared)
66 - TARGET += $(COREX_SHARED_LIB_LEVEL3) $(COREX_SHARED_LIB_LEVEL2) \
67 + TARGET = $(COREX_SHARED_LIB_LEVEL3) $(COREX_SHARED_LIB_LEVEL2) \
68 $(COREX_SHARED_LIB_LEVEL1)
69 endif
70
71 @@ -60,7 +62,7 @@
72
73 ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS}
74 -@rm -rf $@
75 - $(CXX) $(CORE_LDFLAGS) -o $@ $?
76 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME).2.0.0 -o $@ $?
77
78 ${COREX_LIB_LEVEL2}: ${L2_OBJS}
79 -@rm -rf $@
80 @@ -68,7 +70,7 @@
81
82 ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS}
83 -@rm -rf $@
84 - $(CXX) $(CORE_LDFLAGS) -o $@ $?
85 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME).2.0.0 -o $@ $?
86
87 ${COREX_LIB_LEVEL1}: ${L1_OBJS}
88 -@rm -rf $@
89 @@ -76,7 +78,7 @@
90
91 ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS}
92 -@rm -rf $@
93 - $(CXX) $(CORE_LDFLAGS) -o $@ $?
94 + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME).2.0.0 -o $@ $?
95
96 %_level3.o: %.cpp
97 ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@

  ViewVC Help
Powered by ViewVC 1.1.20