From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Jan 2011 22:37:50 +0100
Subject: 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
---
 package/libpri/Makefile               |  2 +-
 package/libpri/patches/patch-Makefile | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'package/libpri')

diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index 101f82c98..5c93c4cc0 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -18,7 +18,7 @@ $(eval $(call PKG_template,LIBPRI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 
 CONFIG_STYLE:=		manual
 
-MAKE_FLAGS+=		CC='${TARGET_CC}' LDCONFIG=''
+MAKE_FLAGS+=		CC='${TARGET_CC}' LDCONFIG='' ARCH=$(ARCH)
 FAKE_FLAGS+=		INSTALL_BASE=/usr
 
 post-install:
diff --git a/package/libpri/patches/patch-Makefile b/package/libpri/patches/patch-Makefile
index e7e553e4a..743924088 100644
--- a/package/libpri/patches/patch-Makefile
+++ b/package/libpri/patches/patch-Makefile
@@ -1,6 +1,36 @@
 --- libpri-1.4.10.2.orig/Makefile	2008-08-06 20:20:51.000000000 +0200
-+++ libpri-1.4.10.2/Makefile	2010-05-29 09:55:08.750000000 +0200
-@@ -146,7 +146,6 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
++++ libpri-1.4.10.2/Makefile	2011-01-21 14:32:08.278658337 +0100
+@@ -31,8 +31,8 @@ CC=gcc
+ GREP=grep
+ AWK=awk
+ 
+-OSARCH=$(shell uname -s)
+-PROC?=$(shell uname -m)
++OSARCH=Linux
++PROC?=$(ARCH)
+ 
+ # 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)
++CFLAGS?=
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+ 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 $@ $<
+@@ -146,7 +147,6 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-- 
cgit v1.2.3