kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/audio/gsm/patches/patch-ab
obache 05d87d2eb8 Update gsm to 1.0.12 a.k.a 1.0-pl12. 
Bump ABI_DEPENDS because reentrant fix changed struct gsm_state.
(It is defined in gsm/private.h, but used by other packages directly).

Fri Jun  2 06:27:56 2006        Jutta Degener (jutta@pobox.com)

        * Release 1.0 Patchlevel 12
        src/code.c: removed modifiable static storage that made the library
                non-reentrant.  (Thanks to Paul Gibbs for pointing out the bug.)

Sat Mar 18 11:48:28 2006        Jutta Degener (jutta@pobox.com)

        * Release 1.0 Patchlevel 11
        src/gsm_implode.c: fix WAV49 implode
        move source archive location
2009-02-03 06:09:09 +00:00

207 lines
5 KiB
Text
Raw Blame History

$NetBSD: patch-ab,v 1.10 2009/02/03 06:09:09 obache Exp $
--- Makefile.orig 2006-04-26 19:14:26.000000000 +0000
+++ Makefile
@@ -43,7 +43,7 @@ WAV49 = -DWAV49
# CC = /usr/lang/acc
# CCFLAGS = -c -O
-CC = gcc -ansi -pedantic
+# CC = gcc -ansi -pedantic
CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
LD = $(CC)
@@ -71,7 +71,7 @@ LD = $(CC)
# Leave INSTALL_ROOT empty (or just don't execute "make install") to
# not install gsm and toast outside of this directory.
-INSTALL_ROOT =
+# INSTALL_ROOT =
# Where do you want to install the gsm library, header file, and manpages?
#
@@ -80,8 +80,8 @@ INSTALL_ROOT =
GSM_INSTALL_ROOT = $(INSTALL_ROOT)
GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
-GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
-GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
+GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
+GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/${PKGMANDIR}/man3
# Where do you want to install the toast binaries and their manpage?
@@ -91,13 +91,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma
TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
+TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/${PKGMANDIR}/man1
# Other tools
SHELL = /bin/sh
-LN = ln
+LN = ln -s
BASENAME = basename
+DIRNAME = dirname
AR = ar
ARFLAGS = cr
RMFLAGS =
@@ -114,7 +115,7 @@ RANLIB = ranlib
# Local Directories
-ROOT = .
+#ROOT = .
ADDTST = $(ROOT)/add-test
TST = $(ROOT)/tst
MAN = $(ROOT)/man
@@ -129,7 +130,7 @@ INC = $(ROOT)/inc
# DEBUG = -DNDEBUG
######### Remove -DNDEBUG to enable assertions.
-CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
$(WAV49) $(CCINC) -I$(INC)
######### It's $(CC) $(CFLAGS)
@@ -139,7 +140,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
# Targets
-LIBGSM = $(LIB)/libgsm.a
+LIBGSM = $(LIB)/libgsm.la
TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast
@@ -257,7 +258,7 @@ STUFF = ChangeLog \
# Install targets
GSM_INSTALL_TARGETS = \
- $(GSM_INSTALL_LIB)/libgsm.a \
+ $(GSM_INSTALL_LIB)/libgsm.la \
$(GSM_INSTALL_INC)/gsm.h \
$(GSM_INSTALL_MAN)/gsm.3 \
$(GSM_INSTALL_MAN)/gsm_explode.3 \
@@ -273,10 +274,15 @@ TOAST_INSTALL_TARGETS = \
# Default rules
+.SUFFIXES: .o .lo
+
.c.o:
$(CC) $(CFLAGS) $?
@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+.c.lo:
+ cd `${DIRNAME} $@` && ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $?
+
# Target rules
all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
@@ -299,16 +305,20 @@ install: toastinstall gsminstall
# The basic API: libgsm
-$(LIBGSM): $(LIB) $(GSM_OBJECTS)
+$(LIBGSM): $(LIB) $(GSM_OBJECTS:.o=.lo)
-rm $(RMFLAGS) $(LIBGSM)
- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
- $(RANLIB) $(LIBGSM)
+ cd $(LIB) && \
+ $(LIBTOOL) --mode=link $(CC) -o `$(BASENAME) $@` \
+ $(GSM_OBJECTS:.o=.lo) \
+ -rpath $(PREFIX)/lib -version-info 1:12
# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
+ cd $(BIN) && \
+ $(LIBTOOL) --mode=link $(LD) $(LFLAGS) -o `$(BASENAME) $@` \
+ $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
$(UNTOAST): $(BIN) $(TOAST)
-rm $(RMFLAGS) $(UNTOAST)
@@ -332,12 +342,12 @@ $(LIB):
gsminstall:
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
- make $(GSM_INSTALL_TARGETS) ; \
+ $(MAKE) $(GSM_INSTALL_TARGETS) ; \
fi
toastinstall:
-if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \
- make $(TOAST_INSTALL_TARGETS); \
+ $(MAKE) $(TOAST_INSTALL_TARGETS); \
fi
gsmuninstall:
@@ -351,52 +361,34 @@ toastuninstall:
fi
$(TOAST_INSTALL_BIN)/toast: $(TOAST)
- -rm $@
- cp $(TOAST) $@
- chmod 755 $@
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN)
$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
- -rm $@
- ln $? $@
+ ${LN} -f toast $@
$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
- -rm $@
- ln $? $@
+ ${LN} -f toast $@
$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
- -rm $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(TOAST_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
- -rm $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
- -rm $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
- -rm $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
- -rm $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
- -rm $@
- cp $? $@
- chmod 444 $@
-
-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
- -rm $@
- cp $? $@
- chmod 444 $@
+ ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_INC)
+
+$(GSM_INSTALL_LIB)/libgsm.la: $(LIBGSM)
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $? $(GSM_INSTALL_LIB)
# Distribution
Reference in a new issue View git blame Copy permalink