Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/gsm/files: gsm-1.0.12-shared.patch digest-gsm-1.0.12-r1
Date: Sat, 15 Dec 2007 17:02:47
Message-Id: E1J3aPS-0007Cu-Ey@stork.gentoo.org
1 drac 07/12/15 17:02:42
2
3 Added: gsm-1.0.12-shared.patch digest-gsm-1.0.12-r1
4 Log:
5 Build objects twice, once -fPIC for shared and once for static.
6 (Portage version: 2.1.4_rc9)
7
8 Revision Changes Path
9 1.1 media-sound/gsm/files/gsm-1.0.12-shared.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gsm/files/gsm-1.0.12-shared.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gsm/files/gsm-1.0.12-shared.patch?rev=1.1&content-type=text/plain
13
14 Index: gsm-1.0.12-shared.patch
15 ===================================================================
16 diff -ur gsm-1.0-pl12.orig/Makefile gsm-1.0-pl12/Makefile
17 --- gsm-1.0-pl12.orig/Makefile 2006-04-26 22:14:26.000000000 +0300
18 +++ gsm-1.0-pl12/Makefile 2007-12-15 18:47:22.000000000 +0200
19 @@ -96,7 +96,7 @@
20 # Other tools
21
22 SHELL = /bin/sh
23 -LN = ln
24 +LN = ln -s
25 BASENAME = basename
26 AR = ar
27 ARFLAGS = cr
28 @@ -140,6 +140,7 @@
29 # Targets
30
31 LIBGSM = $(LIB)/libgsm.a
32 +LIBGSMSO= $(LIB)/libgsm.so
33
34 TOAST = $(BIN)/toast
35 UNTOAST = $(BIN)/untoast
36 @@ -203,24 +204,43 @@
37
38 # Object files
39
40 -GSM_OBJECTS = $(SRC)/add.o \
41 - $(SRC)/code.o \
42 - $(SRC)/debug.o \
43 - $(SRC)/decode.o \
44 - $(SRC)/long_term.o \
45 - $(SRC)/lpc.o \
46 - $(SRC)/preprocess.o \
47 - $(SRC)/rpe.o \
48 - $(SRC)/gsm_destroy.o \
49 - $(SRC)/gsm_decode.o \
50 - $(SRC)/gsm_encode.o \
51 - $(SRC)/gsm_explode.o \
52 - $(SRC)/gsm_implode.o \
53 - $(SRC)/gsm_create.o \
54 - $(SRC)/gsm_print.o \
55 - $(SRC)/gsm_option.o \
56 - $(SRC)/short_term.o \
57 - $(SRC)/table.o
58 +STATIC_GSM_OBJECTS = $(SRC)/add.o \
59 + $(SRC)/code.o \
60 + $(SRC)/debug.o \
61 + $(SRC)/decode.o \
62 + $(SRC)/long_term.o \
63 + $(SRC)/lpc.o \
64 + $(SRC)/preprocess.o \
65 + $(SRC)/rpe.o \
66 + $(SRC)/gsm_destroy.o \
67 + $(SRC)/gsm_decode.o \
68 + $(SRC)/gsm_encode.o \
69 + $(SRC)/gsm_explode.o \
70 + $(SRC)/gsm_implode.o \
71 + $(SRC)/gsm_create.o \
72 + $(SRC)/gsm_print.o \
73 + $(SRC)/gsm_option.o \
74 + $(SRC)/short_term.o \
75 + $(SRC)/table.o
76 +
77 +SHARED_GSM_OBJECTS = $(SRC)/add.lo \
78 + $(SRC)/code.lo \
79 + $(SRC)/debug.lo \
80 + $(SRC)/decode.lo \
81 + $(SRC)/long_term.lo \
82 + $(SRC)/lpc.lo \
83 + $(SRC)/preprocess.lo \
84 + $(SRC)/rpe.lo \
85 + $(SRC)/gsm_destroy.lo \
86 + $(SRC)/gsm_decode.lo \
87 + $(SRC)/gsm_encode.lo \
88 + $(SRC)/gsm_explode.lo \
89 + $(SRC)/gsm_implode.lo \
90 + $(SRC)/gsm_create.lo \
91 + $(SRC)/gsm_print.lo \
92 + $(SRC)/gsm_option.lo \
93 + $(SRC)/short_term.lo \
94 + $(SRC)/table.lo
95
96 TOAST_OBJECTS = $(SRC)/toast.o \
97 $(SRC)/toast_lin.o \
98 @@ -228,7 +248,7 @@
99 $(SRC)/toast_alaw.o \
100 $(SRC)/toast_audio.o
101
102 -OBJECTS = $(GSM_OBJECTS) $(TOAST_OBJECTS)
103 +OBJECTS = $(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS)
104
105 # Manuals
106
107 @@ -277,9 +297,12 @@
108 $(CC) $(CFLAGS) $?
109 @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
110
111 +%.lo: %.c
112 + $(CC) $(CFLAGS) -fPIC -c $< -o $@
113 +
114 # Target rules
115
116 -all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
117 +all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
118 @-echo $(ROOT): Done.
119
120 tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
121 @@ -299,24 +322,29 @@
122
123 # The basic API: libgsm
124
125 -$(LIBGSM): $(LIB) $(GSM_OBJECTS)
126 +$(LIBGSMSO): $(LIB) $(SHARED_GSM_OBJECTS)
127 + $(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc
128 + ln -fs libgsm.so.1.0.12 lib/libgsm.so.1
129 + ln -fs libgsm.so.1.0.12 lib/libgsm.so
130 +
131 +$(LIBGSM): $(LIB) $(STATIC_GSM_OBJECTS)
132 -rm $(RMFLAGS) $(LIBGSM)
133 - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
134 + $(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS)
135 $(RANLIB) $(LIBGSM)
136
137
138 # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
139
140 $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
141 - $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
142 + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
143
144 $(UNTOAST): $(BIN) $(TOAST)
145 -rm $(RMFLAGS) $(UNTOAST)
146 - $(LN) $(TOAST) $(UNTOAST)
147 + $(LN) toast $(UNTOAST)
148
149 $(TCAT): $(BIN) $(TOAST)
150 -rm $(RMFLAGS) $(TCAT)
151 - $(LN) $(TOAST) $(TCAT)
152 + $(LN) toast $(TCAT)
153
154
155 # The local bin and lib directories
156 @@ -426,7 +454,9 @@
157
158 clean: semi-clean
159 -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
160 - $(TOAST) $(TCAT) $(UNTOAST) \
161 + $(LIBGSMSO) $(LIB)/libgsm.so.1.0.12 \
162 + $(LIB)libgsm.so.1 \
163 + $(TOAST) $(TCAT) $(UNTOAST) \
164 $(ROOT)/gsm-1.0.tar.Z
165
166
167
168
169
170 1.1 media-sound/gsm/files/digest-gsm-1.0.12-r1
171
172 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gsm/files/digest-gsm-1.0.12-r1?rev=1.1&view=markup
173 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gsm/files/digest-gsm-1.0.12-r1?rev=1.1&content-type=text/plain
174
175 Index: digest-gsm-1.0.12-r1
176 ===================================================================
177 MD5 8909828c601e82e842e6a0ceade60a4e gsm-1.0.12.tar.gz 62156
178 RMD160 c780aa1405f5029aaacf96183577c6720691dd31 gsm-1.0.12.tar.gz 62156
179 SHA256 dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4 gsm-1.0.12.tar.gz 62156
180
181
182
183 --
184 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups