diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2012-11-05 12:55:53 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2012-11-05 12:55:53 +0000 |
| commit | 5682204c3560cc8d1a1c1a022261b86f3c1fa92b (patch) | |
| tree | a32cfe46c55393fc87f738df7a04a2be9fe01f10 /misc/libpri/files/patch-Makefile | |
| parent | - Update to 1.5 (diff) | |
- Update to 1.4.13
- Do not build utilities: they are not installed anyway but now require
misc/dahdi to be built
- Specify LICENSE
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=307008
Diffstat (limited to 'misc/libpri/files/patch-Makefile')
| -rw-r--r-- | misc/libpri/files/patch-Makefile | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile index 6a4c5d209252..5c79891aef54 100644 --- a/misc/libpri/files/patch-Makefile +++ b/misc/libpri/files/patch-Makefile @@ -1,11 +1,5 @@ ---- Makefile.orig 2011-02-01 06:37:49.000000000 +0600 -+++ Makefile 2011-09-16 14:25:02.000000000 +0700 -@@ -1,4 +1,4 @@ --# -+ # - # libpri: An implementation of Primary Rate ISDN - # - # Written by Mark Spencer <markster@linux-support.net> +--- Makefile.orig 2012-09-26 22:46:23.000000000 +0700 ++++ Makefile 2012-11-03 17:39:22.000000000 +0700 @@ -24,7 +24,7 @@ # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING #ALERTING=-DALERTING_NO_PROGRESS @@ -24,20 +18,21 @@ STATIC_LIBRARY=libpri.a DYNAMIC_LIBRARY:=libpri.so.$(SONAME) -@@ -90,9 +90,9 @@ - rose_qsig_mwi.lo \ - rose_qsig_name.lo \ - version.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) +@@ -67,10 +67,10 @@ + DYNAMIC_OBJS= \ + $(STATIC_OBJS) + CFLAGS ?= -g +-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes ++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes + CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) -INSTALL_PREFIX=$(DESTDIR) -INSTALL_BASE=/usr -+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) +INSTALL_PREFIX=$(PREFIX) +INSTALL_BASE= libdir?=$(INSTALL_BASE)/lib ifneq ($(findstring Darwin,$(OSARCH)),) - SOFLAGS=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace -@@ -110,7 +110,7 @@ + SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace +@@ -88,7 +88,7 @@ ifeq (${OSARCH},FreeBSD) LDCONFIG_FLAGS=-m CFLAGS += -I../zaptel -I../zapata @@ -46,7 +41,7 @@ endif endif ifeq (${OSARCH},SunOS) -@@ -168,12 +168,12 @@ +@@ -148,12 +148,12 @@ mkdir -p $(INSTALL_PREFIX)$(libdir) mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include ifneq (${OSARCH},SunOS) @@ -55,7 +50,7 @@ + $(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include + $(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) #if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi - ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so) + ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so) - install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) - if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi + $(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) @@ -63,7 +58,7 @@ else install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY) -@@ -209,7 +209,7 @@ +@@ -189,7 +189,7 @@ $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< %.lo: %.c @@ -72,12 +67,12 @@ $(STATIC_LIBRARY): $(STATIC_OBJS) ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS) -@@ -217,7 +217,7 @@ +@@ -197,7 +197,7 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . + #$(LDCONFIG) $(LDCONFIG_FLAGS) . - ln -sf libpri.so.$(SONAME) libpri.so + ln -sf $(DYNAMIC_LIBRARY) libpri.so version.c: FORCE |