bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mgen: fix build

Browse Source 
mgen build was spectacularly broken, not even being cross-compiled for the
target, fix that and make sure that we use the toolchain binaries were
relevant.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@39813 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2014-03-08 00:57:10 +00:00
parent cd3b652fff
commit d1fbde20fc
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/mgen/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mgen PKG_NAME:=mgen
PKG_VERSION:=5.01b PKG_VERSION:=5.01b
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=src-$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE:=src-$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=http://downloads.pf.itd.nrl.navy.mil/mgen/ PKG_SOURCE_URL:=http://downloads.pf.itd.nrl.navy.mil/mgen/
@ -38,9 +38,10 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/unix \ $(MAKE) -C $(PKG_BUILD_DIR)/unix \
$(TARGET_CONFIGURE_OPTS) \
CC="$(TARGET_CXX)" \ CC="$(TARGET_CXX)" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \ SYSTEM_INCLUDES="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \ SYSTEM_LDFLAGS="$(TARGET_LDFLAGS)" \
SYSTEM_LIBS="-ldl -lpthread" \ SYSTEM_LIBS="-ldl -lpthread" \
-f Makefile.linux mgen -f Makefile.linux mgen
endef endef

14
net/mgen/patches/100-ipv6.patch
View File

@ -1,7 +1,6 @@
diff -urN mgen.old/protolib/unix/Makefile.linux mgen/protolib/unix/Makefile.linux --- a/protolib/unix/Makefile.linux
--- mgen.old/protolib/unix/Makefile.linux 2008-03-07 22:23:06.000000000 +0100 +++ b/protolib/unix/Makefile.linux
+++ mgen/protolib/unix/Makefile.linux 2009-06-06 20:40:29.000000000 +0200 @@ -39,7 +39,7 @@ SYSTEM_LIBS = -ldl -lrt
@@ -39,7 +39,7 @@
# (We export these for other Makefiles as needed) # (We export these for other Makefiles as needed)
# #
@ -10,10 +9,9 @@ diff -urN mgen.old/protolib/unix/Makefile.linux mgen/protolib/unix/Makefile.linu
-DHAVE_OLD_SIGNALHANDLER -DHAVE_DIRFD -DHAVE_ASSERT -DNO_SCM_RIGHTS -DHAVE_SCHED -DHAVE_OLD_SIGNALHANDLER -DHAVE_DIRFD -DHAVE_ASSERT -DNO_SCM_RIGHTS -DHAVE_SCHED
# (TBD) Move ProtoRouteMgr to ProtokitEx ?? # (TBD) Move ProtoRouteMgr to ProtokitEx ??
diff -urN mgen.old/unix/Makefile.linux mgen/unix/Makefile.linux --- a/unix/Makefile.linux
--- mgen.old/unix/Makefile.linux 2007-06-22 21:16:20.000000000 +0200 +++ b/unix/Makefile.linux
+++ mgen/unix/Makefile.linux 2009-06-06 20:40:10.000000000 +0200 @@ -35,7 +35,7 @@ SYSTEM_LIBS = -ldl -lpthread
@@ -35,7 +35,7 @@
# (We export these for other Makefiles as needed) # (We export these for other Makefiles as needed)
# #

25
net/mgen/patches/200-cflags_override.patch Normal file
View File

@ -0,0 +1,25 @@
--- a/unix/Makefile.linux
+++ b/unix/Makefile.linux
@@ -5,8 +5,8 @@
# 1) System specific additional libraries, include paths, etc
# (Where to find X11 libraries, etc)
#
-SYSTEM_INCLUDES = -I/usr/X11R6/include
-SYSTEM_LDFLAGS = -L/usr/X11R6/lib
+SYSTEM_INCLUDES ?= -I/usr/X11R6/include
+SYSTEM_LDFLAGS ?= -L/usr/X11R6/lib
SYSTEM_LIBS = -ldl -lpthread
# 2) System specific capabilities
@@ -39,8 +39,8 @@ SYSTEM_HAVES = -DLINUX -DHAVE_PSELECT -D
-DHAVE_ASSERT $(NETSEC)
SYSTEM = linux
-CC = g++
-RANLIB = ranlib
-AR = ar
+CC ?= g++
+RANLIB ?= ranlib
+AR ?= ar
include Makefile.common