[Astlinux-commits] SF.net SVN: astlinux: [1707] trunk/package/zaptel

[<kr...@us...>]

Revision: 1707
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1707&view=rev
Author:   krisk84
Date:     2008-03-29 10:08:54 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
fixup zaptel options, fix xppp problems

Modified Paths:
--------------
    trunk/package/zaptel/zaptel.mk

Added Paths:
-----------
    trunk/package/zaptel/zaptel-xppMakefile.patch

Added: trunk/package/zaptel/zaptel-xppMakefile.patch
===================================================================
--- trunk/package/zaptel/zaptel-xppMakefile.patch	                        (rev 0)
+++ trunk/package/zaptel/zaptel-xppMakefile.patch	2008-03-29 17:08:54 UTC (rev 1707)
@@ -0,0 +1,21 @@
+diff -ur zaptel-1.4.9.2.orig/kernel/xpp/utils/Makefile zaptel-1.4.9.2/kernel/xpp/utils/Makefile
+--- zaptel-1.4.9.2.orig/kernel/xpp/utils/Makefile	2008-02-04 18:00:48.000000000 -0500
++++ zaptel-1.4.9.2/kernel/xpp/utils/Makefile	2008-03-29 13:04:52.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ ZAPTEL_DIR	?= ../..
+ 
+--include $(ZAPTEL_DIR)/makeopts
++-include $(ZAPTEL_DIR)/../makeopts
+ 
+ INSTALL_DATA	= $(INSTALL) -m 644
+ 
+@@ -106,7 +106,7 @@
+ 	$(RANLIB) $@
+ 
+ fpga_load: fpga_load.o libhexfile.a
+-	$(CC) -L. -o $@ $@.o $(EXTRA_LIBS) -lhexfile -lusb
++	$(CC) -L. -o $@ $@.o $(EXTRA_LIBS) $(LDFLAGS) $(CFLAGS) -lhexfile -lusb
+ 
+ fpga_load.o: CFLAGS+=-D_GNU_SOURCE	# We use memrchr()
+ 

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2008-03-29 17:07:29 UTC (rev 1706)
+++ trunk/package/zaptel/zaptel.mk	2008-03-29 17:08:54 UTC (rev 1707)
@@ -10,13 +10,21 @@
 ZAPTEL_BINARY := ztcfg
 ZAPTEL_TARGET_BINARY := sbin/ztcfg
 PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
+ZAPTEL_EXTRAS :=
+ZAPTEL_CONFIGURE_ARGS :=
 
+ifeq ($(strip $(BR2_PACKAGE_PPPD)),y)
+ZAPTEL_EXTRAS+=pppd   
+ZAPTEL_CONFIGURE_ARGS+= \
+		--with-ppp="$(STAGING_DIR)/usr"
+endif
+
 ifeq ($(strip $(BR2_PACKAGE_WANPIPE)),y)
-ZAPEXTRAS=wanpipe
+ZAPTEL_EXTRAS=wanpipe
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_ZAPTEL_OSLEC)),y)
-ZAPEXTRAS+=oslec
+ZAPTEL_EXTRAS+=oslec
 endif
 
 ZAPTEL_TARGET_ARCH:=i386
@@ -35,7 +43,8 @@
 $(ZAPTEL_DIR)/.configured: $(ZAPTEL_DIR)/.source
 	(cd $(ZAPTEL_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr" \
+		LDFLAGS="-L$(STAGING_DIR)/usr" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -46,6 +55,7 @@
 		--includedir=/usr/include \
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
+		$(ZAPTEL_CONFIGURE_ARGS) \
         );
 	touch $(ZAPTEL_DIR)/.configured;
 
@@ -69,7 +79,7 @@
 	$(INSTALL) -D -m 755 package/zaptel/zaptel.init $(TARGET_DIR)/etc/init.d/zaptel
 	ln -sf /tmp/etc/zaptel.conf $(TARGET_DIR)/etc/zaptel.conf
 
-zaptel: uclibc newt libusb $(ZAPEXTRAS) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
+zaptel: uclibc newt libusb $(ZAPTEL_EXTRAS) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
 
 zaptel-source: $(DL_DIR)/$(ZAPTEL_SOURCE)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.