summaryrefslogtreecommitdiff
path: root/package/capi4k-utils/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/capi4k-utils/patches')
-rw-r--r--package/capi4k-utils/patches/patch-Makefile42
-rw-r--r--package/capi4k-utils/patches/patch-capi20_capi20_h11
-rw-r--r--package/capi4k-utils/patches/patch-capiinfo_Makefile_in18
-rw-r--r--package/capi4k-utils/patches/patch-pppdcapiplugin_Rules_make18
-rw-r--r--package/capi4k-utils/patches/patch-rcapid_Makefile_in23
5 files changed, 112 insertions, 0 deletions
diff --git a/package/capi4k-utils/patches/patch-Makefile b/package/capi4k-utils/patches/patch-Makefile
new file mode 100644
index 000000000..08e26f592
--- /dev/null
+++ b/package/capi4k-utils/patches/patch-Makefile
@@ -0,0 +1,42 @@
+ - pass CC, CFLAGS and LDFLAGS when running subdir configure and make
+ - install without root-permissions, do not create device nodes
+ - need to pass PPPVERSIONS to subtargets
+--- capi4k-utils.orig/Makefile 2002-11-20 14:45:14.000000000 +0100
++++ capi4k-utils/Makefile 2011-07-15 14:15:21.446001582 +0200
+@@ -53,7 +53,7 @@ ifneq ($(SUBDIRS),)
+ endif
+
+ subtargets: $(CONFIGURATION)
+- set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i all; done
++ set -e; for i in `echo $(SUBDIRS)`; do CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PPPVERSIONS="${PPPVERSIONS}" $(MAKE) -C $$i all; done
+
+ rootperm:
+ @echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
+@@ -62,16 +62,10 @@ rootperm:
+ exit 1; \
+ fi
+
+-install: rootperm
++install:
+ set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
+- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
+- then \
+- echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
+- else \
+- sh scripts/makedev.sh $(DESTDIR) ; \
+- fi
+
+-uninstall: rootperm
++uninstall:
+ set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
+
+ #
+@@ -134,7 +128,7 @@ subconfig: scripts/autoconf.h
+ @set -e; for i in `echo $(SUBDIRS)`; do \
+ if [ -x $$i/configure ] ; then \
+ echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
+- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
++ (cd $$i; CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ elif [ -f $$i/Makefile.in ] ; then \
+ echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
+ $(MAKE) -C $$i -f Makefile.in config; \
diff --git a/package/capi4k-utils/patches/patch-capi20_capi20_h b/package/capi4k-utils/patches/patch-capi20_capi20_h
new file mode 100644
index 000000000..856eaba79
--- /dev/null
+++ b/package/capi4k-utils/patches/patch-capi20_capi20_h
@@ -0,0 +1,11 @@
+ - somehow this header misses sys/types.h (for size_t definition)
+--- capi4k-utils.orig/capi20/capi20.h 2000-11-19 11:15:01.000000000 +0100
++++ capi4k-utils/capi20/capi20.h 2011-07-14 17:26:51.680001337 +0200
+@@ -21,6 +21,7 @@
+ #define __CAPI20_H__
+
+ #include <sys/time.h>
++#include <sys/types.h>
+
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/package/capi4k-utils/patches/patch-capiinfo_Makefile_in b/package/capi4k-utils/patches/patch-capiinfo_Makefile_in
new file mode 100644
index 000000000..5a5ae1c4b
--- /dev/null
+++ b/package/capi4k-utils/patches/patch-capiinfo_Makefile_in
@@ -0,0 +1,18 @@
+ allow CFLAGS override
+--- capi4k-utils.orig/capiinfo/Makefile.in 2002-11-27 09:08:04.000000000 +0100
++++ capi4k-utils/capiinfo/Makefile.in 2011-07-14 18:55:40.657001559 +0200
+@@ -72,10 +72,10 @@ CLEANFILES = *~ comperr
+ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in stamp-h.in comperr
+
+
+-INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+-LDADD = -lcapi20
++INCLUDES += -I../capi20 $(all_includes)
++CFLAGS += -Wall -O2
++LDFLAGS += -L../capi20/.libs -L../capi20 $(all_libraries)
++LDADD += -lcapi20
+
+ bin_PROGRAMS = capiinfo
+
diff --git a/package/capi4k-utils/patches/patch-pppdcapiplugin_Rules_make b/package/capi4k-utils/patches/patch-pppdcapiplugin_Rules_make
new file mode 100644
index 000000000..cd54324e6
--- /dev/null
+++ b/package/capi4k-utils/patches/patch-pppdcapiplugin_Rules_make
@@ -0,0 +1,18 @@
+ allow CC, CFLAGS and LDFLAGS override
+--- capi4k-utils.orig/pppdcapiplugin/Rules.make 2001-05-01 14:43:49.000000000 +0200
++++ capi4k-utils/pppdcapiplugin/Rules.make 2011-07-14 17:13:53.567001779 +0200
+@@ -10,11 +10,11 @@
+
+ vpath %.c $(TOPDIR)
+
+-CC = gcc
++CC ?= gcc
+ INC = -I$(TOPDIR) -I$(CAPIINC) -Ipppd
+ DEFS = -DPPPVER=$(shell $(TOPDIR)/pversion $(PPPVERSION))
+-CFLAGS = -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
+-LDFLAGS = -shared -L$(CAPILIB)
++CFLAGS += -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
++LDFLAGS += -shared -L$(CAPILIB)
+
+ ALL = capiplugin.so userpass.so
+
diff --git a/package/capi4k-utils/patches/patch-rcapid_Makefile_in b/package/capi4k-utils/patches/patch-rcapid_Makefile_in
new file mode 100644
index 000000000..135d5fe25
--- /dev/null
+++ b/package/capi4k-utils/patches/patch-rcapid_Makefile_in
@@ -0,0 +1,23 @@
+ allow overriding things
+--- capi4k-utils.orig/rcapid/Makefile.in 2003-06-16 13:44:29.000000000 +0200
++++ capi4k-utils/rcapid/Makefile.in 2011-07-14 19:01:46.376001436 +0200
+@@ -57,7 +57,7 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-CC = @CC@
++CC ?= @CC@
+ CONFIG_MANDIR = @CONFIG_MANDIR@
+ CONFIG_SBINDIR = @CONFIG_SBINDIR@
+ CPP = @CPP@
+@@ -72,8 +72,8 @@ MAINTAINERCLEANFILES = configure aclocal
+
+
+ INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
++CFLAGS += -Wall -O2
++LDFLAGS += -L../capi20/.libs -L../capi20 $(all_libraries)
+ LDADD = -lcapi20
+
+ sbin_PROGRAMS = rcapid