diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-07-27 10:45:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-07-27 10:45:02 +0200 |
| commit | 42dd254f5937274f164a5a7c5fb3c1f80e38e7af (patch) | |
| tree | 9d2f1aa0333e04af8493d6a5f533b6e243bf5d2b /package/libpri | |
| parent | 7f0a66667a815bb8e28b4c8b93666b92a667b485 (diff) | |
full build on Darwin fixes
Diffstat (limited to 'package/libpri')
| -rw-r--r-- | package/libpri/Makefile | 4 | ||||
| -rw-r--r-- | package/libpri/patches/patch-Makefile | 37 |
2 files changed, 11 insertions, 30 deletions
diff --git a/package/libpri/Makefile b/package/libpri/Makefile index 5c93c4cc0..adf2ec2ce 100644 --- a/package/libpri/Makefile +++ b/package/libpri/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpri -PKG_VERSION:= 1.4.10.2 +PKG_VERSION:= 1.4.12 PKG_RELEASE:= 1 -PKG_MD5SUM:= dc1523d8ee027cd62f20fc6cc9727489 +PKG_MD5SUM:= 9de39b866f049cc20a4f431cc6245166 PKG_DESCR:= C implementation of the Primary Rate ISDN specification PKG_SECTION:= libs PKG_URL:= http://www.asterisk.org/ diff --git a/package/libpri/patches/patch-Makefile b/package/libpri/patches/patch-Makefile index 811ef59a9..7572d0646 100644 --- a/package/libpri/patches/patch-Makefile +++ b/package/libpri/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- libpri-1.4.10.2.orig/Makefile 2008-08-06 20:20:51.000000000 +0200 -+++ libpri-1.4.10.2/Makefile 2011-04-01 14:39:42.851818751 +0200 -@@ -31,8 +31,8 @@ CC=gcc +--- libpri-1.4.12.orig/Makefile 2011-02-01 01:37:49.000000000 +0100 ++++ libpri-1.4.12/Makefile 2012-07-25 12:46:12.000000000 +0200 +@@ -28,8 +28,8 @@ CC=gcc GREP=grep AWK=awk @@ -11,32 +11,13 @@ # SONAME version; should be changed on every ABI change # please don't change it needlessly; it's perfectly fine to have a SONAME -@@ -43,7 +43,8 @@ STATIC_LIBRARY=libpri.a - DYNAMIC_LIBRARY:=libpri.so.$(SONAME) - STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o - DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) +@@ -90,7 +90,8 @@ DYNAMIC_OBJS= \ + rose_qsig_mwi.lo \ + rose_qsig_name.lo \ + version.lo +-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) +CFLAGS?= -+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) ++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) INSTALL_PREFIX=$(DESTDIR) INSTALL_BASE=/usr libdir?=$(INSTALL_BASE)/lib -@@ -135,7 +136,7 @@ pridump: pridump.o - MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP - - %.o: %.c -- $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< - - %.lo: %.c - $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< -@@ -145,8 +146,7 @@ $(STATIC_LIBRARY): $(STATIC_OBJS) - ranlib $(STATIC_LIBRARY) - - $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) -- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) -- $(LDCONFIG) $(LDCONFIG_FLAGS) . -+ $(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS) - ln -sf libpri.so.$(SONAME) libpri.so - - version.c: FORCE |