- Update to version 1.0.18 * Remove the MacOS "quarantine" files that I didn't know I'd shipped. * Remove some trailing spaces. * Bump up the patchlevel in inc/gsm.h (I'd forgotten that in release 17.) - Changes from version 1.0.17 * New email addresses in the README. * Avoid left-shifting signed integers. * Don't print longwords using %d or %ld, cast them to (long) first. * Don't compare longwords as longs in addtest, we only care for the lower 32 bits. (The math works, but the test failed). - Changes from version 1.0.16 * New email addresses in the manual pages (patch 16). * Removed a stray .orig file (in patch 15). - Rebase libgsm-1.0.13.patch. - Drop libgsm-strict-aliasing.patch: Applied upstream. - Drop ancient Obsoletes/Provides. OBS-URL: https://build.opensuse.org/request/show/678435 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libgsm?expand=0&rev=21
74 lines
1.9 KiB
Diff
74 lines
1.9 KiB
Diff
From: <jochen@scram.de>
|
|
Subject: New patch generated from libgsm 1.0.10-14 diff.gz
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -96,7 +96,7 @@ TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT
|
|
# Other tools
|
|
|
|
SHELL = /bin/sh
|
|
-LN = ln
|
|
+LN = ln -s
|
|
BASENAME = basename
|
|
AR = ar
|
|
ARFLAGS = cr
|
|
@@ -140,6 +140,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
|
|
# Targets
|
|
|
|
LIBGSM = $(LIB)/libgsm.a
|
|
+LIBGSMSO= $(LIB)/libgsm.so
|
|
|
|
TOAST = $(BIN)/toast
|
|
UNTOAST = $(BIN)/untoast
|
|
@@ -279,7 +280,7 @@ TOAST_INSTALL_TARGETS = \
|
|
|
|
# Target rules
|
|
|
|
-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
|
|
+all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
|
|
@-echo $(ROOT): Done.
|
|
|
|
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
|
|
@@ -299,6 +300,11 @@ install: toastinstall gsminstall
|
|
|
|
# The basic API: libgsm
|
|
|
|
+$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
|
|
+ $(LD) $(LDFLAGS) -o $@.1.0.18 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc
|
|
+ ln -fs libgsm.so.1.0.18 lib/libgsm.so.1
|
|
+ ln -fs libgsm.so.1.0.18 lib/libgsm.so
|
|
+
|
|
$(LIBGSM): $(LIB) $(GSM_OBJECTS)
|
|
-rm $(RMFLAGS) $(LIBGSM)
|
|
$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
|
|
@@ -308,15 +314,15 @@ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
|
|
# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
|
|
|
|
$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
|
|
- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
|
|
+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
|
|
|
|
$(UNTOAST): $(BIN) $(TOAST)
|
|
-rm $(RMFLAGS) $(UNTOAST)
|
|
- $(LN) $(TOAST) $(UNTOAST)
|
|
+ $(LN) toast $(UNTOAST)
|
|
|
|
$(TCAT): $(BIN) $(TOAST)
|
|
-rm $(RMFLAGS) $(TCAT)
|
|
- $(LN) $(TOAST) $(TCAT)
|
|
+ $(LN) toast $(TCAT)
|
|
|
|
|
|
# The local bin and lib directories
|
|
@@ -426,7 +432,9 @@ semi-clean:
|
|
|
|
clean: semi-clean
|
|
-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
|
|
- $(TOAST) $(TCAT) $(UNTOAST) \
|
|
+ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.18 \
|
|
+ $(LIB)libgsm.so.1 \
|
|
+ $(TOAST) $(TCAT) $(UNTOAST) \
|
|
$(ROOT)/gsm-1.0.tar.Z
|
|
|
|
|