summaryrefslogtreecommitdiff
path: root/package/palantir/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-22 22:37:50 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-22 22:37:50 +0100
commit9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch)
treeadb1937bc90be8869a5f7c9636da84773414eb3b /package/palantir/patches
parent52b1b0100c53b1f8699955df618fcb47744e0a7e (diff)
activate GCC cflags check, cleanup FLAGS stuff in OpenADK.
* remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ... * activate GCC_HONOUR_COPTS and fix all packages to honour CFLAGS * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all build compilation, remove HOST* variants * introduce KERNEL_MODULE_FLAGS for external kernel modules * mark rpm package as broken, mark syslinux for native builds only, mark libhugetlb for eglibc/glibc only usage
Diffstat (limited to 'package/palantir/patches')
-rw-r--r--package/palantir/patches/patch-server_Makefile26
-rw-r--r--package/palantir/patches/patch-server_libgsm_Makefile53
2 files changed, 79 insertions, 0 deletions
diff --git a/package/palantir/patches/patch-server_Makefile b/package/palantir/patches/patch-server_Makefile
new file mode 100644
index 000000000..a9bc81951
--- /dev/null
+++ b/package/palantir/patches/patch-server_Makefile
@@ -0,0 +1,26 @@
+--- palantir-2.7.orig/server/Makefile 2007-05-19 01:31:36.000000000 +0200
++++ palantir-2.7/server/Makefile 2011-01-20 15:24:19.478658283 +0100
+@@ -47,10 +47,11 @@ ENABLE_X11MON= 0
+ .PHONY : tools man
+
+
+-CFLAGS= -Wall -D_REENTRANT -O2 -g
++CFLAGS?= -Wall -D_REENTRANT -O2 -g
+ # -O3
+-CC= gcc
+-libjpeg= -ljpeg
++CC?= gcc
++LIBS?=
++LIBS+= -ljpeg -lpthread
+
+ ifeq ($(TARGET),mips)
+ BROADCOM_SRC= /usr/local/broadcom/src
+@@ -86,7 +87,7 @@ SRCS= *.c
+ libgsm= libgsm/lib/libgsm.a
+
+ palantir: $(libgsm) $(OBJ) tools man
+- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(libgsm) $(libjpeg) -lpthread -o palantir
++ $(CC) $(LDFLAGS) $(OBJ) $(libgsm) $(LIBS) -o palantir
+
+ mips:
+ make TARGET=mips palantir
diff --git a/package/palantir/patches/patch-server_libgsm_Makefile b/package/palantir/patches/patch-server_libgsm_Makefile
new file mode 100644
index 000000000..079e9a825
--- /dev/null
+++ b/package/palantir/patches/patch-server_libgsm_Makefile
@@ -0,0 +1,53 @@
+--- palantir-2.7.orig/server/libgsm/Makefile 2007-03-31 11:50:49.000000000 +0200
++++ palantir-2.7/server/libgsm/Makefile 2011-01-20 15:22:46.318658281 +0100
+@@ -49,11 +49,11 @@ WAV49 = -DWAV49
+ # CCFLAGS = -c -O
+
+ ifndef CC
+-CC = gcc
++CC ?= gcc
+ endif
+
+-CC += -ansi -pedantic
+-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
++CFLAGS += -ansi -pedantic
++CPPFLAGS ?= -DNeedFunctionPrototypes=1
+
+ LD = $(CC)
+
+@@ -80,7 +80,7 @@ SHELL = /bin/sh
+ LN = ln
+ BASENAME = basename
+ ifndef AR
+-AR = ar
++AR ?= ar
+ endif
+ ARFLAGS = cr
+ RMFLAGS =
+@@ -89,7 +89,7 @@ COMPRESS = compress
+ COMPRESSFLAGS =
+ # RANLIB = true
+ ifndef RANLIB
+-RANLIB = ranlib
++RANLIB ?= ranlib
+ endif
+
+ #
+@@ -109,7 +109,7 @@ INC = $(ROOT)/inc
+ # DEBUG = -DNDEBUG
+ ######### Remove -DNDEBUG to enable assertions.
+
+-CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
++CFLAGS += $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+ $(WAV49) $(CCINC) -I$(INC)
+ ######### It's $(CC) $(CFLAGS)
+
+@@ -177,7 +177,7 @@ GSM_OBJECTS = $(SRC)/add.o \
+ # Default rules
+
+ .c.o:
+- $(CC) $(CFLAGS) $?
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $?
+ @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+
+ # Target rules