From 220a96f9926788ed531717f78e44fdf1e7ab3b34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Dec 2010 22:45:29 +0100 Subject: rework architecture / embedded systems concept Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;) --- package/libpcap/Makefile | 2 +- package/libpcap/patches/patch-Makefile_in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package/libpcap') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index caacf0e8c..ebc7701ce 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-yydebug \ --with-pcap=linux TCFLAGS+= ${TCPPFLAGS} INSTALL_TARGET= install install-shared -MAKE_FLAGS+= STAGING_DIR=$(STAGING_DIR) +MAKE_FLAGS+= STAGING_TARGET_DIR=$(STAGING_TARGET_DIR) ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 diff --git a/package/libpcap/patches/patch-Makefile_in b/package/libpcap/patches/patch-Makefile_in index deb816cd6..d967498c3 100644 --- a/package/libpcap/patches/patch-Makefile_in +++ b/package/libpcap/patches/patch-Makefile_in @@ -6,8 +6,8 @@ @rm -f $@ $@.tmp - sed -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@libdir[@]|$(libdir)|g' \ -+ sed -e 's|@includedir[@]|$(STAGING_DIR)$(includedir)|g' \ -+ -e 's|@libdir[@]|$(STAGING_DIR)$(libdir)|g' \ ++ sed -e 's|@includedir[@]|$(STAGING_TARGET_DIR)$(includedir)|g' \ ++ -e 's|@libdir[@]|$(STAGING_TARGET_DIR)$(libdir)|g' \ -e 's|@LIBS[@]|$(LIBS)|g' \ -e 's|@V_RPATH_OPT[@]|$(V_RPATH_OPT)|g' \ $(srcdir)/pcap-config.in >$@.tmp -- cgit v1.2.3