From 2b198ddc02b3231e43ab8fdddef76ff103a0f5a4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Aug 2009 21:41:25 +0200 Subject: make allmodconfig work for alix1c eglibc many upstream package updates, squid, php, asterisk, gnutls, nmap, sqlite, dhcp, git --- package/libnet/patches/patch-src_Makefile | 72 +++++++++++++++++++------------ 1 file changed, 45 insertions(+), 27 deletions(-) (limited to 'package/libnet/patches/patch-src_Makefile') diff --git a/package/libnet/patches/patch-src_Makefile b/package/libnet/patches/patch-src_Makefile index a8027477d..400ba1b45 100644 --- a/package/libnet/patches/patch-src_Makefile +++ b/package/libnet/patches/patch-src_Makefile @@ -1,6 +1,6 @@ --- Libnet-1.0.2a.orig/src/Makefile 1970-01-01 00:00:00.000000000 +0100 -+++ Libnet-1.0.2a/src/Makefile 2009-06-12 21:52:51.000000000 +0200 -@@ -0,0 +1,502 @@ ++++ Libnet-1.0.2a/src/Makefile 2009-08-23 00:40:10.950411820 +0200 +@@ -0,0 +1,520 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# src/Makefile. Generated from Makefile.in by configure. + @@ -19,9 +19,9 @@ + +SOURCES = $(libnet_la_SOURCES) + -+srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/src -+top_srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a -+VPATH = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/src ++srcdir = . ++top_srcdir = .. ++ +pkgdatadir = $(datadir)/libnet +pkglibdir = $(libdir)/libnet +pkgincludedir = $(includedir)/libnet @@ -39,7 +39,7 @@ +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : -+build_triplet = x86_64-undermydesk-freebsd ++build_triplet = i686-pc-linux-gnu +host_triplet = i586-pc-linux-gnu +target_triplet = i586-pc-linux-gnu +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -60,7 +60,7 @@ +am_libnet_la_OBJECTS = libnet_resolve.lo libnet_socket.lo \ + libnet_checksum.lo libnet_prand.lo libnet_version.lo \ + libnet_write_ip.lo libnet_insert_ipo.lo libnet_insert_tcpo.lo \ -+ libnet_error.lo libnet_link_.lo \ ++ libnet_error.lo libnet_link_sockpacket.lo \ + libnet_packet_mem.lo libnet_build_ip.lo libnet_build_tcp.lo \ + libnet_build_udp.lo libnet_build_arp.lo \ + libnet_build_ethernet.lo libnet_build_icmp.lo \ @@ -90,31 +90,35 @@ +AMDEP_FALSE = +AMDEP_TRUE = # +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run tar -+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar ++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ar +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoconf +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoheader +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run automake-1.8 +AWK = gawk +BIN_PREFIX = /usr/bin/ -+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc ++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc +CCDEPMODE = depmode=none +CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -Wall -+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E ++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps -+ECHO = echo ++DSYMUTIL = ++DUMPBIN = +ECHO_C = +ECHO_N = -n +ECHO_T = -+EGREP = grep -E ++EGREP = /bin/grep -E +EXEEXT = ++FGREP = /bin/grep -F ++GREP = /bin/grep +INC_PREFIX = /usr/include/ +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ++LD = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ld +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib +LIBNET_CONFIG_CFLAGS = +LIBNET_CONFIG_DEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H -DLIBNET_LIL_ENDIAN @@ -123,14 +127,20 @@ +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LIB_PREFIX = /usr/lib/ -+LL_INT_TYPE = -+LL_INT_TYPE_UC = ++LIPO = ++LL_INT_TYPE = sockpacket ++LL_INT_TYPE_UC = SOCKPACKET +LN = ln +LN_S = ln -s +LTLIBOBJS = +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run makeinfo +MAN_PREFIX = /usr/share/man/man3/ ++NM = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-nm ++NMEDIT = ++OBJDUMP = i586-linux-objdump +OBJEXT = o ++OTOOL = ++OTOOL64 = +PACKAGE = libnet +PACKAGE_BUGREPORT = +PACKAGE_NAME = @@ -138,43 +148,51 @@ +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : -+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib ++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ranlib ++SED = /home/wbx/openadk/scripts/sed +SET_MAKE = -+SHELL = /usr/local/bin/bash ++SHELL = /bin/bash +STRIP = i586-linux-strip +VERSION = 1.0.2a +ac_ct_CC = -+ac_ct_RANLIB = -+ac_ct_STRIP = ++ac_ct_DUMPBIN = +am__fastdepCC_FALSE = +am__fastdepCC_TRUE = # +am__include = include +am__leading_dot = . +am__quote = +bindir = ${exec_prefix}/bin -+build = x86_64-undermydesk-freebsd -+build_alias = amd64-undermydesk-freebsd -+build_cpu = x86_64 -+build_os = freebsd -+build_vendor = undermydesk ++build = i686-pc-linux-gnu ++build_alias = i686-pc-linux-gnu ++build_cpu = i686 ++build_os = linux-gnu ++build_vendor = pc +datadir = /usr/share ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE} ++dvidir = ${docdir} +exec_prefix = ${prefix} +host = i586-pc-linux-gnu +host_alias = i586-linux +host_cpu = i586 +host_os = linux-gnu +host_vendor = pc ++htmldir = ${docdir} +includedir = ${prefix}/include -+infodir = ${prefix}/info ++infodir = ${datarootdir}/info +install_sh = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/install-sh +libdir = ${exec_prefix}/lib +libexecdir = /usr/sbin ++localedir = ${datarootdir}/locale +localstatedir = /var ++lt_ECHO = echo +mandir = /usr/share/man -+mkdir_p = $(mkinstalldirs) ++mkdir_p = mkdir -p -- . +oldincludedir = /usr/include ++pdfdir = ${docdir} +prefix = /usr -+program_transform_name = s,$$,,;s,^,, ++program_transform_name = s&$$&&;s&^&& ++psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = /etc @@ -196,7 +214,7 @@ + libnet_insert_ipo.c \ + libnet_insert_tcpo.c \ + libnet_error.c \ -+ libnet_link_.c \ ++ libnet_link_sockpacket.c \ + libnet_packet_mem.c \ + libnet_build_ip.c \ + libnet_build_tcp.c \ -- cgit v1.2.3