From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MkzEB-00065D-OV for garchives@archives.gentoo.org; Tue, 08 Sep 2009 11:51:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A165E0B16; Tue, 8 Sep 2009 11:51:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 206A8E0B16 for ; Tue, 8 Sep 2009 11:51:15 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id C0D5CB47BD for ; Tue, 8 Sep 2009 11:51:14 +0000 (UTC) Received: from ssuominen by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MkzEA-0003Mi-DT for gentoo-commits@lists.gentoo.org; Tue, 08 Sep 2009 11:51:14 +0000 From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-sound/gsm/files: gsm-1.0.13-shared.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: gsm-1.0.13-shared.patch X-VCS-Directories: media-sound/gsm/files X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: Sender: Samuli Suominen Date: Tue, 08 Sep 2009 11:51:14 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b18a4c21-295d-4581-b373-a32f8bfdada4 X-Archives-Hash: fc8b00b512be91b45f56d781b268f36f ssuominen 09/09/08 11:51:14 Added: gsm-1.0.13-shared.patch Log: Raise .so version from 1.0.12 to 1.0.13 and respect LDFLAGS wrt #283048= . (Portage version: 2.2_rc40/cvs/Linux x86_64) Revision Changes Path 1.1 media-sound/gsm/files/gsm-1.0.13-shared.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gsm/fi= les/gsm-1.0.13-shared.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gsm/fi= les/gsm-1.0.13-shared.patch?rev=3D1.1&content-type=3Dtext/plain Index: gsm-1.0.13-shared.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile --- gsm-1.0-pl13.orig/Makefile 2006-04-26 22:14:26.000000000 +0300 +++ gsm-1.0-pl13/Makefile 2009-09-08 14:50:02.000000000 +0300 @@ -96,7 +96,7 @@ # Other tools =20 SHELL =3D /bin/sh -LN =3D ln +LN =3D ln -s BASENAME =3D basename AR =3D ar ARFLAGS =3D cr @@ -140,6 +140,7 @@ # Targets =20 LIBGSM =3D $(LIB)/libgsm.a +LIBGSMSO=3D $(LIB)/libgsm.so =20 TOAST =3D $(BIN)/toast UNTOAST =3D $(BIN)/untoast @@ -203,24 +204,43 @@ =20 # Object files =20 -GSM_OBJECTS =3D $(SRC)/add.o \ - $(SRC)/code.o \ - $(SRC)/debug.o \ - $(SRC)/decode.o \ - $(SRC)/long_term.o \ - $(SRC)/lpc.o \ - $(SRC)/preprocess.o \ - $(SRC)/rpe.o \ - $(SRC)/gsm_destroy.o \ - $(SRC)/gsm_decode.o \ - $(SRC)/gsm_encode.o \ - $(SRC)/gsm_explode.o \ - $(SRC)/gsm_implode.o \ - $(SRC)/gsm_create.o \ - $(SRC)/gsm_print.o \ - $(SRC)/gsm_option.o \ - $(SRC)/short_term.o \ - $(SRC)/table.o +STATIC_GSM_OBJECTS =3D $(SRC)/add.o \ + $(SRC)/code.o \ + $(SRC)/debug.o \ + $(SRC)/decode.o \ + $(SRC)/long_term.o \ + $(SRC)/lpc.o \ + $(SRC)/preprocess.o \ + $(SRC)/rpe.o \ + $(SRC)/gsm_destroy.o \ + $(SRC)/gsm_decode.o \ + $(SRC)/gsm_encode.o \ + $(SRC)/gsm_explode.o \ + $(SRC)/gsm_implode.o \ + $(SRC)/gsm_create.o \ + $(SRC)/gsm_print.o \ + $(SRC)/gsm_option.o \ + $(SRC)/short_term.o \ + $(SRC)/table.o + +SHARED_GSM_OBJECTS =3D $(SRC)/add.lo \ + $(SRC)/code.lo \ + $(SRC)/debug.lo \ + $(SRC)/decode.lo \ + $(SRC)/long_term.lo \ + $(SRC)/lpc.lo \ + $(SRC)/preprocess.lo \ + $(SRC)/rpe.lo \ + $(SRC)/gsm_destroy.lo \ + $(SRC)/gsm_decode.lo \ + $(SRC)/gsm_encode.lo \ + $(SRC)/gsm_explode.lo \ + $(SRC)/gsm_implode.lo \ + $(SRC)/gsm_create.lo \ + $(SRC)/gsm_print.lo \ + $(SRC)/gsm_option.lo \ + $(SRC)/short_term.lo \ + $(SRC)/table.lo =20 TOAST_OBJECTS =3D $(SRC)/toast.o \ $(SRC)/toast_lin.o \ @@ -228,7 +248,7 @@ $(SRC)/toast_alaw.o \ $(SRC)/toast_audio.o =20 -OBJECTS =3D $(GSM_OBJECTS) $(TOAST_OBJECTS) +OBJECTS =3D $(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS) =20 # Manuals =20 @@ -277,9 +297,12 @@ $(CC) $(CFLAGS) $? @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 =20 +%.lo: %.c + $(CC) $(CFLAGS) -fPIC -c $< -o $@ + # Target rules =20 -all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) +all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) @-echo $(ROOT): Done. =20 tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result @@ -299,24 +322,29 @@ =20 # The basic API: libgsm =20 -$(LIBGSM): $(LIB) $(GSM_OBJECTS) +$(LIBGSMSO): $(LIB) $(SHARED_GSM_OBJECTS) + $(LD) $(LFLAGS) -o $@.1.0.13 -shared -Xlinker -soname -Xlinker libgsm.= so.1 $(SHARED_GSM_OBJECTS) -lc + ln -fs libgsm.so.1.0.13 lib/libgsm.so.1 + ln -fs libgsm.so.1.0.13 lib/libgsm.so + +$(LIBGSM): $(LIB) $(STATIC_GSM_OBJECTS) -rm $(RMFLAGS) $(LIBGSM) - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) + $(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS) $(RANLIB) $(LIBGSM) =20 =20 # Toast, Untoast and Tcat -- the compress-like frontends to gsm. =20 $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) - $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) =20 $(UNTOAST): $(BIN) $(TOAST) -rm $(RMFLAGS) $(UNTOAST) - $(LN) $(TOAST) $(UNTOAST) + $(LN) toast $(UNTOAST) =20 $(TCAT): $(BIN) $(TOAST) -rm $(RMFLAGS) $(TCAT) - $(LN) $(TOAST) $(TCAT) + $(LN) toast $(TCAT) =20 =20 # The local bin and lib directories @@ -426,7 +454,9 @@ =20 clean: semi-clean -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ - $(TOAST) $(TCAT) $(UNTOAST) \ + $(LIBGSMSO) $(LIB)/libgsm.so.1.0.13 \ + $(LIB)libgsm.so.1 \ + $(TOAST) $(TCAT) $(UNTOAST) \ $(ROOT)/gsm-1.0.tar.Z =20 =20