From 75a77e28962431e563c66e2acceb02d5187df119 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Jan 2011 23:43:11 +0100 Subject: fix dependency --- package/lvm/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 67ae4d6cc..7863fe58e 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -15,6 +15,7 @@ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER PKGSD_DEVICE_MAPPER:= device-mapper utility +PKGSS_DEVICE_MAPPER:= libdevmapper PKGSD_LIBDEVMAPPER:= device-mapper library PKGSC_LIBDEVMAPPER:= libs -- cgit v1.2.3 From cde33531cc2f70323f24127775eacf66364d38c8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Jan 2011 00:27:29 +0100 Subject: fix brcm targets. add LZMA and flashmap code patches. * add support for Linksys WRT54GS the automatic rflash size recognition is still open. --- package/libtool/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/libtool/Makefile b/package/libtool/Makefile index bfc3695eb..3c89c5a50 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= a generic dynamic object loading library PKG_SECTION:= lang PKG_URL:= http://www.gnu.org/software/libtool/ PKG_SITES:= ${MASTER_SITE_GNU:=libtool/} +PKG_NEED_CXX:= 1 PKG_SUBPKGS:= LIBTOOL LIBLTDL LIBLTDL_DEV PKGSC_LIBLTDL:= libs -- cgit v1.2.3 From d3c4a628fbee8ccda9c3500a01c7d817adbb9e4d Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 19 Jan 2011 02:06:32 +0100 Subject: iproute2: fix compiling tc helper libs First of all, tc may support iptables if available. Dedicate a sub-package for the libs generated then, so the plain tc package will always contain the same stuff regardless of whether iptables is there or not. Given the right options, iproute2 is indeed able to detect iptables and libatm, so do that instead of using a shipped Config file. Patches updated as a nice side effect. Signed-off-by: Phil Sutter --- package/iproute2/Makefile | 20 +++++---- package/iproute2/files/Config | 2 - package/iproute2/patches/patch-Makefile | 8 ++-- package/iproute2/patches/patch-configure | 59 +++++++++++++++++++++++---- package/iproute2/patches/patch-netem_Makefile | 6 +-- 5 files changed, 69 insertions(+), 26 deletions(-) delete mode 100644 package/iproute2/files/Config (limited to 'package') diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index f0c815e59..8ce92d5e2 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -5,20 +5,23 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iproute2 PKG_VERSION:= 2.6.37 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 9774ff9d74ebd301bf56bd8d74473786 PKG_DESCR:= iproute2 routing control utility PKG_SECTION:= route PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 PKG_SITES:= http://devresources.linuxfoundation.org/dev/iproute2/download/ -PKG_SUBPKGS:= IP TC TC_ATM IFSTAT LNSTAT ROUTEL RTMON SS +PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS PKGSD_TC:= iproute2 traffic control utility PKGSS_TC:= kmod-sched PKGSB_TC:= iptables PKGSD_TC_ATM:= iproute2 traffic control ATM support library PKGSS_TC_ATM:= tc libatm PKGSB_TC_ATM:= linux-atm +PKGSD_TC_IPT:= iproute 2 traffic control IPTables support library +PKGSS_TC_IPT:= tc iptables +PKGSB_TC_IPT:= iptables PKGSD_IFSTAT:= iproute2 interface statistics utility PKGSD_LNSTAT:= iproute2 network statistics utilities PKGSD_ROUTEL:= iproute2 route list and flush utilities @@ -32,6 +35,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC},${PKGSD_TC},${PKG_SECTION})) $(eval $(call PKG_template,TC_ATM,tc-atm,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_ATM},${PKGSD_TC_ATM},${PKG_SECTION})) +$(eval $(call PKG_template,TC_IPT,tc-iptables,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_IPT},${PKGSD_TC_IPT},${PKG_SECTION})) $(eval $(call PKG_template,IFSTAT,ifstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_IFSTAT},${PKG_SECTION})) $(eval $(call PKG_template,LNSTAT,lnstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LNSTAT},${PKG_SECTION})) $(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_ROUTEL},${PKG_SECTION})) @@ -41,10 +45,7 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK TCFLAGS+= -D_GNU_SOURCE XAKE_FLAGS+= CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \ HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include" -CONFIGURE_FLAGS+= KERNEL_INCLUDE="${LINUX_DIR}/include" - -post-configure: - $(CP) ./files/Config $(WRKBUILD)/ +CONFIGURE_ENV+= IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}" ip-install: ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin} @@ -53,8 +54,6 @@ ip-install: tc-install: ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin,usr/lib/tc} - # use ${CP} here, since m_ipt.so is a symlink to m_xt.so - ${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/ ${CP} ${WRKINST}/usr/lib/tc/*.dist ${IDIR_TC}/usr/lib/tc/ ${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/ @@ -63,6 +62,11 @@ tc-atm-install: ${INSTALL_DATA} ${WRKINST}/lib/tc/q_atm.so \ ${IDIR_TC_ATM}/lib/tc/ +tc-iptables-install: + ${INSTALL_DIR} ${IDIR_TC_IPT}/lib/tc + # use ${CP} here, since m_ipt.so is a symlink to m_xt.so + ${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/ + ifstat-install: ${INSTALL_DIR} ${IDIR_IFSTAT}/usr/sbin ${INSTALL_BIN} ${WRKINST}/sbin/ifstat ${IDIR_IFSTAT}/usr/sbin diff --git a/package/iproute2/files/Config b/package/iproute2/files/Config deleted file mode 100644 index 0ba7d387d..000000000 --- a/package/iproute2/files/Config +++ /dev/null @@ -1,2 +0,0 @@ -TC_CONFIG_ATM:=y -TC_CONFIG_XT:=y diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile index 841c6f32e..d84ffa57b 100644 --- a/package/iproute2/patches/patch-Makefile +++ b/package/iproute2/patches/patch-Makefile @@ -3,9 +3,9 @@ overriding CCOPTS instead wont work, as this variable is being used to compile host-utils in netem/ - define LIBUTIL for misc/ss to compile correctly ---- iproute2-2.6.29-1.orig/Makefile 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/Makefile 2009-11-25 08:59:58.000000000 +0100 -@@ -20,10 +20,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o +--- iproute2-2.6.37.orig/Makefile 2011-01-07 18:54:30.000000000 +0100 ++++ iproute2-2.6.37/Makefile 2011-01-18 02:19:41.379921947 +0100 +@@ -27,10 +27,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o #options for ipx ADDLIB+=ipx_ntop.o ipx_pton.o @@ -20,7 +20,7 @@ YACCFLAGS = -d -t -v LDLIBS += -L../lib -lnetlink -lutil -@@ -31,6 +31,7 @@ LDLIBS += -L../lib -lnetlink -lutil +@@ -38,6 +38,7 @@ LDLIBS += -L../lib -lnetlink -lutil SUBDIRS=lib ip tc misc netem genl LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure index 38586090d..a5cf58b45 100644 --- a/package/iproute2/patches/patch-configure +++ b/package/iproute2/patches/patch-configure @@ -1,30 +1,71 @@ - use the compiler passed in $CC ---- iproute2-2.6.29-1.orig/configure 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/configure 2009-08-22 02:23:52.642364236 +0200 -@@ -16,7 +16,7 @@ int main(int argc, char **argv) { + - use the compiler passed in $CC + - predefine iptables modules dir, since the check would + always fail (cause of absolute search paths) and OpenADK + (for now) doesn't compile iptables with shared objects + - do not discard compiler output from tests, they're useful + for debugging + - additionally output the full compiler command before running + it +--- iproute2-2.6.37.orig/configure 2011-01-07 18:54:30.000000000 +0100 ++++ iproute2-2.6.37/configure 2011-01-18 02:37:39.800716449 +0100 +@@ -15,7 +15,8 @@ int main(int argc, char **argv) { return 0; } EOF -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 -+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 ++echo "$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm" ++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm if [ $? -eq 0 ] then echo "TC_CONFIG_ATM:=y" >>Config -@@ -49,7 +49,7 @@ int main(int argc, char **argv) { +@@ -49,7 +50,8 @@ int main(int argc, char **argv) + + EOF + +-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 ++echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables" ++if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables + then + echo "TC_CONFIG_XT:=y" >>Config + echo "using xtables" +@@ -86,7 +88,8 @@ int main(int argc, char **argv) { } EOF -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl" ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl if [ $? -eq 0 ] then -@@ -81,7 +81,7 @@ int main(int argc, char **argv) { +@@ -126,7 +129,8 @@ int main(int argc, char **argv) { } EOF -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl" ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl if [ $? -eq 0 ] then +@@ -149,18 +153,8 @@ check_ipt() + + check_ipt_lib_dir() + { +- IPT_LIB_DIR="" +- for dir in /lib /usr/lib /usr/local/lib +- do +- for file in $dir/$TABLES/lib*t_*so ; do +- if [ -f $file ]; then +- echo $dir/$TABLES +- echo "IPT_LIB_DIR:=$dir/$TABLES" >> Config +- return +- fi +- done +- done +- echo "not found!" ++ echo "/usr/lib/$TABLES" ++ echo "IPT_LIB_DIR:=/usr/lib/$TABLES" >> Config + } + + echo "# Generated config based on" $INCLUDE >Config diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile index 325d01925..b0aa792f7 100644 --- a/package/iproute2/patches/patch-netem_Makefile +++ b/package/iproute2/patches/patch-netem_Makefile @@ -1,5 +1,5 @@ ---- iproute2-2.6.29-1.orig/netem/Makefile 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/netem/Makefile 2009-12-11 16:39:15.000000000 +0100 +--- iproute2-2.6.37.orig/netem/Makefile 2011-01-07 18:54:30.000000000 +0100 ++++ iproute2-2.6.37/netem/Makefile 2011-01-18 02:19:41.386925447 +0100 @@ -2,13 +2,13 @@ DISTGEN = maketable normal pareto pareto DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist @@ -24,4 +24,4 @@ + $(HOSTCC) $(HOSTCFLAGS) -I../include -o $@ $@.c -lm install: all - mkdir -p $(DESTDIR)/lib/tc + mkdir -p $(DESTDIR)$(LIBDIR)/tc -- cgit v1.2.3 From 9739631579b741dabcaf335ee3657913bb5324c2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 19 Jan 2011 11:46:27 +0100 Subject: port tzdata/tzcode Signed-off-by: Phil Sutter --- package/tzdata/Makefile | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/tzdata/Makefile (limited to 'package') diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile new file mode 100644 index 000000000..fd496e883 --- /dev/null +++ b/package/tzdata/Makefile @@ -0,0 +1,48 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= tzdata +PKG_VERSION:= 2010o +PKG_RELEASE:= 1 +PKG_MD5SUM:= 5cae5c56fad81dc29f8fcd933a05768e a7a776a5713831993e814fe0c05f9fd5 +PKG_DESCR:= Timezone data (/usr/share/zoneinfo) +PKG_SECTION:= utils +PKG_URL:= ftp://elsie.nci.nih.gov/pub/ +PKG_SITES:= ftp://elsie.nci.nih.gov/pub/ +# Note that tzcode does NOT have the same version as tzdata does :[ +DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode2010n.tar.gz +# both archives do not extract into subdirectories +WRKDIST= ${WRKDIR} + +# no use for tzselect, since that is a ksh-script +PKG_SUBPKGS:= TZDATA ZDUMP ZIC DATE +PKGSD_ZDUMP:= timezone file dumper +PKGSD_ZIC:= timezone file compiler +PKGSD_DATE:= famous date utility + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TZDATA,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ZDUMP,zdump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZDUMP},${PKG_SECTION})) +$(eval $(call PKG_template,ZIC,zic,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZIC},${PKG_SECTION})) +$(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION})) + +CONFIG_STYLE:= manual +XAKE_FLAGS+= TOPDIR="${WRKINST}" TZDIR="${WRKINST}/usr/share/zoneinfo" cc="${TARGET_CC}" +# the uppercase targets enable building and installation of the date utility +ALL_TARGET:= ALL +INSTALL_TARGET:= INSTALL + +post-install: + $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share + $(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share + ${INSTALL_DIR} ${IDIR_ZDUMP}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/etc/zdump ${IDIR_ZDUMP}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_ZIC}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/etc/zic ${IDIR_ZIC}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_DATE}/usr/bin + ${INSTALL_BIN} ${WRKINST}/bin/date ${IDIR_DATE}/usr/bin/ + +include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 438b1f972d897987ce95cdd28bcab264b9d820c4 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 19 Jan 2011 11:46:28 +0100 Subject: port libhugetlbfs Signed-off-by: Phil Sutter --- package/libhugetlbfs/Makefile | 36 ++++++++++++++++ package/libhugetlbfs/patches/patch-Makefile | 67 +++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 package/libhugetlbfs/Makefile create mode 100644 package/libhugetlbfs/patches/patch-Makefile (limited to 'package') diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile new file mode 100644 index 000000000..600d154e9 --- /dev/null +++ b/package/libhugetlbfs/Makefile @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libhugetlbfs +PKG_VERSION:= 2.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= cda489010e5bb89eb59994f689f8693e +PKG_DESCR:= easy hugepage access +PKG_SECTION:= libs +PKG_URL:= http://libhugetlbfs.ozlabs.org/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBHUGETLBFS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +XAKE_FLAGS+= PREFIX=/usr DESTDIR=${WRKINST} ADK_ARCH=${CPU_ARCH} +ALL_TARGET:= libs tools + +post-install: + $(INSTALL_DIR) $(IDIR_LIBHUGETLBFS)/usr/{bin,lib,share/libhugetlbfs/ldscripts} + $(INSTALL_BIN) $(WRKINST)/usr/bin/{cpupcstat,huge{adm,ctl,edit},pagesize} \ + $(IDIR_LIBHUGETLBFS)/usr/bin + ${INSTALL_DATA} ${WRKINST}/usr/lib/libhugetlbfs* \ + ${IDIR_LIBHUGETLBFS}/usr/lib + ${INSTALL_BIN} ${WRKINST}/usr/share/libhugetlbfs/ld.hugetlbfs \ + ${IDIR_LIBHUGETLBFS}/usr/share/libhugetlbfs + ${INSTALL_DATA} ${WRKINST}/usr/share/libhugetlbfs/ldscripts/* \ + ${IDIR_LIBHUGETLBFS}/usr/share/libhugetlbfs/ldscripts + ${CP} ${WRKINST}/usr/share/libhugetlbfs/ld \ + ${IDIR_LIBHUGETLBFS}/usr/share/libhugetlbfs + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libhugetlbfs/patches/patch-Makefile b/package/libhugetlbfs/patches/patch-Makefile new file mode 100644 index 000000000..44deaba1d --- /dev/null +++ b/package/libhugetlbfs/patches/patch-Makefile @@ -0,0 +1,67 @@ + - do not call uname -m, use passed ${ADK_ARCH} variable + - use ${CC} instead of hard-coded gcc +--- libhugetlbfs-2.6.orig/Makefile 2009-08-24 14:56:07.000000000 +0200 ++++ libhugetlbfs-2.6/Makefile 2011-01-17 15:17:03.942093253 +0100 +@@ -30,51 +30,51 @@ CFLAGS ?= -O2 -g + CFLAGS += -Wall -fPIC + CPPFLAGS += -D__LIBHUGETLBFS__ + +-ARCH = $(shell uname -m | sed -e s/i.86/i386/) ++ARCH = $(shell echo ${ADK_ARCH} | sed -e s/i.86/i386/) + + ifeq ($(ARCH),ppc64) +-CC64 = gcc -m64 ++CC64 = ${CC} -m64 + ELF64 = elf64ppc + TMPLIB64 = lib64 + TMPLIB32 = lib + ifneq ($(BUILDTYPE),NATIVEONLY) +-CC32 = gcc -m32 ++CC32 = ${CC} -m32 + ELF32 = elf32ppclinux + endif + else + ifeq ($(ARCH),ppc) +-CC32 = gcc -m32 ++CC32 = ${CC} -m32 + ELF32 = elf32ppclinux + TMPLIB32 = lib + else + ifeq ($(ARCH),i386) +-CC32 = gcc ++CC32 = ${CC} + ELF32 = elf_i386 + TMPLIB32 = lib + else + ifeq ($(ARCH),x86_64) +-CC64 = gcc -m64 ++CC64 = ${CC} -m64 + ELF64 = elf_x86_64 + TMPLIB64 = lib64 + TMPLIB32 = lib + ifneq ($(BUILDTYPE),NATIVEONLY) +-CC32 = gcc -m32 ++CC32 = ${CC} -m32 + ELF32 = elf_i386 + endif + else + ifeq ($(ARCH),ia64) +-CC64 = gcc ++CC64 = ${CC} + TMPLIB64 = lib64 + CFLAGS += -DNO_ELFLINK + else + ifeq ($(ARCH),sparc64) +-CC64 = gcc -m64 ++CC64 = ${CC} -m64 + TMPLIB64 = lib64 + CFLAGS += -DNO_ELFLINK + else + ifeq ($(ARCH),s390x) +-CC64 = gcc -m64 +-CC32 = gcc -m31 ++CC64 = ${CC} -m64 ++CC32 = ${CC} -m31 + TMPLIB64 = lib64 + TMPLIB32 = lib + CFLAGS += -DNO_ELFLINK -- cgit v1.2.3 From b93120252893422b92cf4c6a55aa075d8c04fa4a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Jan 2011 19:46:49 +0100 Subject: sync gcc patches from toolchain --- package/gcc/patches/cflags.patch | 253 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) create mode 100644 package/gcc/patches/cflags.patch (limited to 'package') diff --git a/package/gcc/patches/cflags.patch b/package/gcc/patches/cflags.patch new file mode 100644 index 000000000..0d5815a54 --- /dev/null +++ b/package/gcc/patches/cflags.patch @@ -0,0 +1,253 @@ + + This patch brings over a few features from MirBSD: + * -fhonour-copts + If this option is not given, it's warned (depending + on environment variables). This is to catch errors + of misbuilt packages which override CFLAGS themselves. + * -Werror-maybe-reset + Has the effect of -Wno-error if GCC_NO_WERROR is + set and not '0', a no-operation otherwise. This is + to be able to use -Werror in "make" but prevent + GNU autoconf generated configure scripts from + freaking out. + * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks + the default for -O2/-Os, because they trigger gcc bugs + and can delete code with security implications. + + This patch was authored by Thorsten Glaser + with copyright assignment to the FSF in effect. + +--- a/gcc/c-opts.c ++++ b/gcc/c-opts.c +@@ -105,6 +105,9 @@ + /* Number of deferred options scanned for -include. */ + static size_t include_cursor; + ++/* Check if a port honours COPTS. */ ++static int honour_copts = 0; ++ + static void set_Wimplicit (int); + static void handle_OPT_d (const char *); + static void set_std_cxx98 (int); +@@ -454,6 +457,9 @@ + enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); + break; + ++ case OPT_Werror_maybe_reset: ++ break; ++ + case OPT_Wformat: + set_Wformat (value); + break; +@@ -690,6 +701,12 @@ + flag_exceptions = value; + break; + ++ case OPT_fhonour_copts: ++ if (c_language == clk_c) { ++ honour_copts++; ++ } ++ break; ++ + case OPT_fimplement_inlines: + flag_implement_inlines = value; + break; +@@ -1209,6 +1226,47 @@ + return false; + } + ++ if (c_language == clk_c) { ++ char *ev = getenv ("GCC_HONOUR_COPTS"); ++ int evv; ++ if (ev == NULL) ++ evv = -1; ++ else if ((*ev == '0') || (*ev == '\0')) ++ evv = 0; ++ else if (*ev == '1') ++ evv = 1; ++ else if (*ev == '2') ++ evv = 2; ++ else if (*ev == 's') ++ evv = -1; ++ else { ++ warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1"); ++ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ ++ } ++ if (evv == 1) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in lenient mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ warning (0, "someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } else if (evv == 2) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in strict mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ error ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ return false; ++ } ++ } else if (evv == 0) { ++ if (honour_copts != 1) ++ inform (0, "someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } ++ + return true; + } + +--- a/gcc/c.opt ++++ b/gcc/c.opt +@@ -215,6 +215,10 @@ + C ObjC RejectNegative Warning + This switch is deprecated; use -Werror=implicit-function-declaration instead + ++Werror-maybe-reset ++C ObjC C++ ObjC++ ++; Documented in common.opt ++ + Wfloat-equal + C ObjC C++ ObjC++ Var(warn_float_equal) Warning + Warn if testing floating point numbers for equality +@@ -609,6 +613,9 @@ + fhonor-std + C++ ObjC++ + ++fhonour-copts ++C ObjC C++ ObjC++ RejectNegative ++ + fhosted + C ObjC + Assume normal C execution environment +--- a/gcc/common.opt ++++ b/gcc/common.opt +@@ -102,6 +102,10 @@ + Common Joined + Treat specified warning as error + ++Werror-maybe-reset ++Common ++If environment variable GCC_NO_WERROR is set, act as -Wno-error ++ + Wextra + Common Warning + Print extra (possibly unwanted) warnings +@@ -573,6 +577,9 @@ + Common Report Var(flag_guess_branch_prob) Optimization + Enable guessing of branch probabilities + ++fhonour-copts ++Common RejectNegative ++ + ; Nonzero means ignore `#ident' directives. 0 means handle them. + ; Generate position-independent code for executables if possible + ; On SVR4 targets, it also controls whether or not to emit a +--- a/gcc/opts.c ++++ b/gcc/opts.c +@@ -896,8 +896,6 @@ + flag_schedule_insns_after_reload = opt2; + #endif + flag_regmove = opt2; +- flag_strict_aliasing = opt2; +- flag_strict_overflow = opt2; + flag_reorder_blocks = opt2; + flag_reorder_functions = opt2; + flag_tree_vrp = opt2; +@@ -922,6 +919,8 @@ + + /* -O3 optimizations. */ + opt3 = (optimize >= 3); ++ flag_strict_aliasing = opt3; ++ flag_strict_overflow = opt3; + flag_predictive_commoning = opt3; + flag_inline_functions = opt3; + flag_unswitch_loops = opt3; +@@ -1601,6 +1601,17 @@ + enable_warning_as_error (arg, value, lang_mask); + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ warnings_are_errors = 0; ++ } ++ break; ++ ++ case OPT_fhonour_copts: ++ break; ++ + case OPT_Wlarger_than_: + /* This form corresponds to -Wlarger-than-. + Kept for backward compatibility. +--- a/gcc/doc/cppopts.texi ++++ b/gcc/doc/cppopts.texi +@@ -164,6 +164,11 @@ + Make all warnings into hard errors. Source code which triggers warnings + will be rejected. + ++ at item -Werror-maybe-reset ++ at opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ + @item -Wsystem-headers + @opindex Wsystem-headers + Issue warnings for code in system headers. These are normally unhelpful +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -234,7 +234,7 @@ + -Wconversion -Wcoverage-mismatch -Wno-deprecated @gol + -Wno-deprecated-declarations -Wdisabled-optimization @gol + -Wno-div-by-zero -Wempty-body -Wenum-compare -Wno-endif-labels @gol +--Werror -Werror=* @gol ++-Werror -Werror=* -Werror-maybe-reset @gol + -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol + -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol + -Wformat-security -Wformat-y2k @gol +@@ -4161,6 +4161,22 @@ + @option{-Wall} and by @option{-pedantic}, which can be disabled with + @option{-Wno-pointer-sign}. + ++ at item -Werror-maybe-reset ++ at opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ ++ at item -fhonour-copts ++ at opindex fhonour-copts ++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not ++given at least once, and warn if it is given more than once. ++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not ++given exactly once. ++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option ++is not given exactly once. ++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. ++This flag and environment variable only affect the C language. ++ + @item -Wstack-protector + @opindex Wstack-protector + @opindex Wno-stack-protector +@@ -5699,7 +5715,7 @@ + second branch or a point immediately following it, depending on whether + the condition is known to be true or false. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fsplit-wide-types + @opindex fsplit-wide-types +--- a/gcc/java/jvspec.c ++++ b/gcc/java/jvspec.c +@@ -670,6 +670,7 @@ + class name. Append dummy `.c' that can be stripped by set_input so %b + is correct. */ + set_input (concat (main_class_name, "main.c", NULL)); ++ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ + err = do_spec (jvgenmain_spec); + if (err == 0) + { -- cgit v1.2.3 From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb 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/aiccu/Makefile | 12 +- package/alix-switch/Makefile | 6 +- package/arpd/Makefile | 8 +- package/asterisk/Makefile | 9 +- package/atftp/Makefile | 9 +- package/aufs2-util/Makefile | 2 +- package/aufs2-util/patches/patch-Makefile | 8 +- package/avahi/Makefile | 2 +- package/axtls/Makefile | 4 +- package/bind/Makefile | 33 +- package/binutils/Makefile | 2 +- package/bitlbee/Makefile | 2 +- package/bzip2/Makefile | 3 +- package/cryptinit/Makefile | 4 +- package/cups/Makefile | 4 +- package/cutter/Makefile | 6 +- package/cxxtools/Makefile | 10 +- package/digitemp/Makefile | 2 +- package/dillo/Makefile | 5 +- package/e2fsprogs/Makefile | 10 +- package/eglibc/Makefile | 6 +- package/elinks/Makefile | 2 +- package/ether-wake/Makefile | 6 +- package/exmap/Makefile | 7 +- package/faad2/Makefile | 2 +- package/fakeidentd/Makefile | 6 +- package/ffmpeg/Makefile | 6 +- package/firefox/Makefile | 10 +- package/firefox/patches/patch-configure | 4 +- .../patches/patch-security_coreconf_Linux_mk | 15 + .../patches/patch-security_coreconf_command_mk | 11 + package/gatling/Makefile | 4 +- package/gcc/Makefile | 7 +- package/gdb/Makefile | 6 +- package/gpm/Makefile | 2 +- package/gpsd/Makefile | 8 +- package/haserl/Makefile | 2 +- package/heimdal/Makefile | 14 +- .../heimdal/patches/patch-lib_roken_Makefile_in | 2 +- package/httping/Makefile | 3 +- package/huawei/Makefile | 4 +- package/icecast/Makefile | 2 +- package/id3lib/Makefile | 6 +- package/igmpproxy/Makefile | 5 +- package/iperf/Makefile | 6 +- package/iproute2/Makefile | 4 +- package/ipset/Makefile | 5 +- package/ipset/patches/patch-Makefile | 36 + package/iptraf/patches/patch-src_Makefile | 70 +- package/iptraf/patches/patch-support_Makefile | 9 +- package/iw/Makefile | 2 +- package/knock/Makefile | 1 - package/krb5/Makefile | 2 +- package/libart/Makefile | 2 + package/libevent/Makefile | 3 +- package/libhugetlbfs/Makefile | 6 +- package/libhugetlbfs/patches/patch-Makefile | 6 +- package/libhugetlbfs/patches/patch-morecore_c | 11 + package/libhugetlbfs/patches/patch-version | 5 + package/libiconv/Makefile | 2 +- package/libid3tag/Makefile | 2 +- package/libid3tag/patches/patch-configure | 14 + package/libnet/Makefile | 1 - package/libosip2/patches/patch-configure | 11 + package/libowfat/Makefile | 2 +- package/libpcap/Makefile | 4 +- package/libpri/Makefile | 2 +- package/libpri/patches/patch-Makefile | 34 +- package/libupnp/Makefile | 2 +- package/libvirt/Makefile | 2 +- package/lighttpd/Makefile | 2 +- package/logrotate/Makefile | 2 +- package/lua/Makefile | 4 +- package/lynx/Makefile | 7 +- package/madplay/Makefile | 2 +- package/madplay/patches/patch-configure | 14 + package/maradns/Makefile | 7 +- package/maradns/patches/cross-compile-fix.patch | 18 +- package/maradns/patches/patch-Makefile | 22 +- package/maradns/patches/patch-build_Makefile_linux | 8 +- package/maradns/patches/patch-dns_Makefile | 23 +- .../maradns/patches/patch-dns_Makefile_recursive | 21 + package/maradns/patches/patch-libs_Makefile | 31 + package/maradns/patches/patch-parse_Makefile | 80 + .../maradns/patches/patch-qual_Makefile_threadsafe | 9 + .../maradns/patches/patch-rng_rng-32bit-tables_h | 4 +- package/maradns/patches/patch-server_Makefile | 40 +- .../patches/patch-server_Makefile_recursive | 37 + package/maradns/patches/patch-tcp_Makefile | 19 +- .../maradns/patches/patch-tcp_Makefile_recursive | 17 + .../maradns/patches/patch-tools_Makefile_recursive | 25 + package/mgetty/patches/patch-Makefile | 22 +- package/miax/Makefile | 6 +- package/microperl/Makefile | 2 +- package/microperl/patches/patch-Makefile_micro | 4 +- package/miredo/Makefile | 2 +- package/mksh/Makefile | 6 +- package/mpd/Makefile | 2 +- package/mplayer/Makefile | 4 +- package/mrd6/Makefile | 6 +- package/mt-daapd/Makefile | 2 +- package/mtd/Makefile | 4 +- package/mysql/Makefile | 26 +- package/mysql/patches/patch-include_config_h_in | 4 +- .../mysql/patches/patch-scripts_mysql_config_sh | 11 + package/nand/Makefile | 6 +- package/ncurses/Makefile | 2 +- package/net-snmp/Makefile | 2 +- package/net-snmp/patches/patch-net-snmp-config_in | 15 + package/nfs-utils/patches/patch-config_log | 5831 ++++++++++++++ .../nfs-utils/patches/patch-utils_gssd_Makefile_in | 25 + package/nmap/Makefile | 2 +- package/nspr/Makefile | 2 +- package/nss/Makefile | 12 +- package/ntpclient/Makefile | 2 +- package/nut/Makefile | 14 +- package/olsrd/Makefile | 2 +- package/openswan/patches/patch-Makefile_top | 11 + package/openswan/patches/patch-lib_libdns_Makefile | 22 +- .../openswan/patches/patch-lib_libdns_Makefile_in | 20 + package/openswan/patches/patch-lib_libisc_Makefile | 11 + .../openswan/patches/patch-lib_libisc_Makefile_in | 23 + package/osiris/Makefile | 2 +- package/osiris/patches/patch-configure | 23 +- .../patches/patch-src_osirisd_modules_Makefile_am | 11 + .../patches/patch-src_osirisd_modules_Makefile_in | 11 + package/owfs/Makefile | 2 +- package/palantir/Makefile | 6 +- package/palantir/patches/patch-server_Makefile | 26 + .../palantir/patches/patch-server_libgsm_Makefile | 53 + package/parprouted/Makefile | 4 +- package/pcre/Makefile | 2 +- package/php/Makefile | 2 +- package/picocom/Makefile | 1 - package/picocom/patches/patch-Makefile | 18 + package/pmacct/Makefile | 4 +- package/pmacct/patches/patch-configure | 41 + .../patches/patch-src_nfprobe_plugin_netflow9_c | 64 - package/portmap/Makefile | 6 +- package/portsentry/Makefile | 2 +- package/ppp/Makefile | 4 +- package/ppp/patches/patch-chat_Makefile_linux | 52 +- package/ppp/patches/patch-configure | 84 +- package/ppp/patches/patch-linux_Makefile_top | 17 + package/ppp/patches/patch-pppd_Makefile_linux | 224 +- package/ppp/patches/patch-pppd_ccp_c | 1362 ---- package/ppp/patches/patch-pppd_ccp_h | 20 - package/ppp/patches/patch-pppd_chap_ms_c | 22 - .../ppp/patches/patch-pppd_plugins_Makefile_linux | 32 +- .../patch-pppd_plugins_pppoatm_Makefile_linux | 50 +- .../patch-pppd_plugins_pppol2tp_Makefile_linux | 36 +- .../patch-pppd_plugins_radius_Makefile_linux | 88 +- .../patch-pppd_plugins_rp-pppoe_Makefile_linux | 64 +- package/ppp/patches/patch-pppd_sys-linux_c | 16 - package/ppp/patches/patch-pppdump_Makefile_linux | 37 +- package/ppp/patches/patch-pppstats_Makefile_linux | 48 +- package/ppp/src/linux/Makedefs.gcc | 21 + package/ppp/src/makedefs.linux | 14 - package/pptpd/Makefile | 2 +- package/privoxy/Makefile | 4 +- package/procmail/Makefile | 2 +- package/python/Makefile | 2 +- package/python2/Makefile | 2 +- package/python2/patches/patch-Makefile_pre | 267 + package/python2/patches/patch-Makefile_pre_in | 11 +- package/qemu/Makefile | 4 +- package/rarpd/Makefile | 2 +- package/rarpd/patches/patch-Makefile_in | 18 +- package/rpcbind/Makefile | 2 +- package/rpm/Makefile | 7 +- package/rpm/patches/patch-configure | 11 + package/rrdcollect/Makefile | 5 +- package/rrdtool/Makefile | 2 +- package/rtsp/Makefile | 5 +- package/samba/Makefile | 2 +- package/scsi-spin/Makefile | 6 +- package/serdisplib/Makefile | 7 +- package/setpwc/Makefile | 5 +- package/setserial/Makefile | 3 +- package/setserial/patches/patch-Makefile_in | 20 + package/sqlite/Makefile | 6 +- package/stress/patches/patch-src_Makefile_in | 11 + package/strongswan/patches/patch-configure | 19 + package/syslinux/Makefile | 2 + package/syslinux/patches/patch-MCONFIG | 19 + package/syslinux/patches/patch-MCONFIG_build | 12 + .../syslinux/patches/patch-com32_cmenu_complex_c32 | Bin 0 -> 74113 bytes .../syslinux/patches/patch-com32_cmenu_display_c32 | Bin 0 -> 28995 bytes .../syslinux/patches/patch-com32_cmenu_simple_c32 | Bin 0 -> 49545 bytes .../syslinux/patches/patch-com32_cmenu_test2_c32 | Bin 0 -> 73558 bytes .../syslinux/patches/patch-com32_cmenu_test_c32 | Bin 0 -> 71651 bytes .../patches/patch-com32_gfxboot_gfxboot_c32 | Bin 0 -> 44803 bytes package/syslinux/patches/patch-com32_hdt_hdt_c32 | Bin 0 -> 474295 bytes package/syslinux/patches/patch-com32_lib_MCONFIG | 27 + .../patches/patch-com32_libutil_libutil_com_a | Bin 0 -> 63705 bytes .../patches/patch-com32_libutil_libutil_lnx_a | Bin 0 -> 269249 bytes .../syslinux/patches/patch-com32_lua_src_lua_c32 | Bin 0 -> 415545 bytes .../syslinux/patches/patch-com32_mboot_mboot_c32 | Bin 0 -> 63379 bytes package/syslinux/patches/patch-com32_menu_menu_c32 | Bin 0 -> 115544 bytes .../syslinux/patches/patch-com32_menu_vesamenu_c32 | Bin 0 -> 269531 bytes .../syslinux/patches/patch-com32_modules_cat_c32 | Bin 0 -> 12237 bytes .../syslinux/patches/patch-com32_modules_chain_c32 | Bin 0 -> 36049 bytes .../syslinux/patches/patch-com32_modules_cmd_c32 | Bin 0 -> 1683 bytes .../patches/patch-com32_modules_config_c32 | Bin 0 -> 10319 bytes .../syslinux/patches/patch-com32_modules_cpuid_c32 | Bin 0 -> 11473 bytes .../patches/patch-com32_modules_cpuidtest_c32 | Bin 0 -> 22736 bytes .../syslinux/patches/patch-com32_modules_disk_c32 | Bin 0 -> 11360 bytes .../patches/patch-com32_modules_dmitest_c32 | Bin 0 -> 69719 bytes .../syslinux/patches/patch-com32_modules_elf_c32 | Bin 0 -> 53553 bytes .../patches/patch-com32_modules_ethersel_c32 | Bin 0 -> 54754 bytes .../patches/patch-com32_modules_gpxecmd_c32 | Bin 0 -> 5022 bytes .../syslinux/patches/patch-com32_modules_host_c32 | Bin 0 -> 9590 bytes .../patches/patch-com32_modules_ifcpu64_c32 | Bin 0 -> 2627 bytes .../syslinux/patches/patch-com32_modules_ifcpu_c32 | Bin 0 -> 28662 bytes .../patches/patch-com32_modules_ifplop_c32 | Bin 0 -> 4982 bytes .../patches/patch-com32_modules_kbdmap_c32 | Bin 0 -> 10637 bytes .../syslinux/patches/patch-com32_modules_linux_c32 | Bin 0 -> 34675 bytes .../syslinux/patches/patch-com32_modules_ls_c32 | Bin 0 -> 20023 bytes .../patches/patch-com32_modules_meminfo_c32 | Bin 0 -> 11147 bytes .../patches/patch-com32_modules_pcitest_c32 | Bin 0 -> 60465 bytes .../patches/patch-com32_modules_pmload_c32 | Bin 0 -> 27073 bytes .../syslinux/patches/patch-com32_modules_pwd_c32 | Bin 0 -> 4106 bytes .../patches/patch-com32_modules_sanboot_c32 | Bin 0 -> 5150 bytes .../syslinux/patches/patch-com32_modules_sdi_c32 | Bin 0 -> 47885 bytes .../patches/patch-com32_modules_vesainfo_c32 | Bin 0 -> 11300 bytes .../patches/patch-com32_modules_vpdtest_c32 | Bin 0 -> 12100 bytes .../patches/patch-com32_modules_whichsys_c32 | Bin 0 -> 5807 bytes package/syslinux/patches/patch-com32_rosh_rosh_c32 | Bin 0 -> 39736 bytes .../patches/patch-com32_samples_advdump_c32 | Bin 0 -> 10637 bytes .../patches/patch-com32_samples_entrydump_c32 | Bin 0 -> 9941 bytes .../patches/patch-com32_samples_fancyhello_c32 | Bin 0 -> 17857 bytes .../patches/patch-com32_samples_fancyhello_lnx | Bin 0 -> 25415 bytes .../syslinux/patches/patch-com32_samples_hello_c32 | Bin 0 -> 10645 bytes .../patches/patch-com32_samples_keytest_c32 | Bin 0 -> 19824 bytes .../patches/patch-com32_samples_keytest_lnx | Bin 0 -> 51699 bytes .../patches/patch-com32_samples_resolv_c32 | Bin 0 -> 9747 bytes .../patches/patch-com32_samples_serialinfo_c32 | Bin 0 -> 9802 bytes .../patches/patch-com32_sysdump_sysdump_c32 | Bin 0 -> 72542 bytes package/tcl/Makefile | 2 +- package/tcsh/patches/patch-Makefile_in | 2 +- package/tinc/patches/patch-src_Makefile_in | 11 + package/tntnet/Makefile | 6 +- package/traceroute/Makefile | 2 +- package/trafshow/Makefile | 5 +- package/trafshow/patches/patch-Makefile_in | 38 +- package/tslib/patches/autotool.patch | 2 +- package/tslib/patches/patch-ltmain_sh | 8416 -------------------- package/ttcp/Makefile | 6 +- package/tzdata/Makefile | 2 + package/tzdata/patches/patch-Makefile | 64 + package/ulogd/Makefile | 2 +- package/ussp-push/Makefile | 4 +- package/util-linux-ng/Makefile | 8 +- package/uvd/Makefile | 6 +- package/valgrind/patches/patch-configure | 52 +- package/vnc-reflector/Makefile | 5 +- package/vnc-reflector/patches/patch-Makefile | 55 + package/vnstat/patches/patch-src_Makefile | 9 + package/weechat/Makefile | 6 +- package/wpa_supplicant/Makefile | 6 +- package/xbindkeys/patches/patch-Makefile_in | 13 + package/xf86-input-evtouch/patches/patch-configure | 11 + package/xfsprogs/Makefile | 2 +- package/xfsprogs/patches/patch-configure | 352 + package/xfsprogs/patches/patch-copy_xfs_copy_c | 82 + package/xfsprogs/patches/patch-fsr_xfs_fsr_c | 57 + package/xfsprogs/patches/patch-libxfs_linux_c | 35 + package/xinetd/patches/ar.patch | 72 - package/xinetd/patches/destdir.patch | 28 - package/xinetd/patches/patch-Makefile_in | 36 + .../xinetd/patches/patch-libs_src_misc_Makefile_in | 11 + .../patches/patch-libs_src_portable_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_pset_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_sio_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_str_Makefile_in | 11 + .../xinetd/patches/patch-libs_src_xlog_Makefile_in | 11 + 276 files changed, 8821 insertions(+), 10616 deletions(-) create mode 100644 package/firefox/patches/patch-security_coreconf_Linux_mk create mode 100644 package/firefox/patches/patch-security_coreconf_command_mk create mode 100644 package/ipset/patches/patch-Makefile create mode 100644 package/libhugetlbfs/patches/patch-morecore_c create mode 100644 package/libhugetlbfs/patches/patch-version create mode 100644 package/libid3tag/patches/patch-configure create mode 100644 package/libosip2/patches/patch-configure create mode 100644 package/madplay/patches/patch-configure create mode 100644 package/maradns/patches/patch-dns_Makefile_recursive create mode 100644 package/maradns/patches/patch-libs_Makefile create mode 100644 package/maradns/patches/patch-parse_Makefile create mode 100644 package/maradns/patches/patch-qual_Makefile_threadsafe create mode 100644 package/maradns/patches/patch-server_Makefile_recursive create mode 100644 package/maradns/patches/patch-tcp_Makefile_recursive create mode 100644 package/maradns/patches/patch-tools_Makefile_recursive create mode 100644 package/mysql/patches/patch-scripts_mysql_config_sh create mode 100644 package/net-snmp/patches/patch-net-snmp-config_in create mode 100644 package/nfs-utils/patches/patch-config_log create mode 100644 package/nfs-utils/patches/patch-utils_gssd_Makefile_in create mode 100644 package/openswan/patches/patch-Makefile_top create mode 100644 package/openswan/patches/patch-lib_libdns_Makefile_in create mode 100644 package/openswan/patches/patch-lib_libisc_Makefile create mode 100644 package/openswan/patches/patch-lib_libisc_Makefile_in create mode 100644 package/osiris/patches/patch-src_osirisd_modules_Makefile_am create mode 100644 package/osiris/patches/patch-src_osirisd_modules_Makefile_in create mode 100644 package/palantir/patches/patch-server_Makefile create mode 100644 package/palantir/patches/patch-server_libgsm_Makefile create mode 100644 package/picocom/patches/patch-Makefile create mode 100644 package/pmacct/patches/patch-configure delete mode 100644 package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c create mode 100644 package/ppp/patches/patch-linux_Makefile_top delete mode 100644 package/ppp/patches/patch-pppd_ccp_c delete mode 100644 package/ppp/patches/patch-pppd_ccp_h delete mode 100644 package/ppp/patches/patch-pppd_chap_ms_c delete mode 100644 package/ppp/patches/patch-pppd_sys-linux_c create mode 100644 package/ppp/src/linux/Makedefs.gcc delete mode 100644 package/ppp/src/makedefs.linux create mode 100644 package/python2/patches/patch-Makefile_pre create mode 100644 package/rpm/patches/patch-configure create mode 100644 package/setserial/patches/patch-Makefile_in create mode 100644 package/stress/patches/patch-src_Makefile_in create mode 100644 package/strongswan/patches/patch-configure create mode 100644 package/syslinux/patches/patch-MCONFIG create mode 100644 package/syslinux/patches/patch-MCONFIG_build create mode 100644 package/syslinux/patches/patch-com32_cmenu_complex_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_display_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_simple_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_test2_c32 create mode 100644 package/syslinux/patches/patch-com32_cmenu_test_c32 create mode 100644 package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32 create mode 100644 package/syslinux/patches/patch-com32_hdt_hdt_c32 create mode 100644 package/syslinux/patches/patch-com32_lib_MCONFIG create mode 100644 package/syslinux/patches/patch-com32_libutil_libutil_com_a create mode 100644 package/syslinux/patches/patch-com32_libutil_libutil_lnx_a create mode 100644 package/syslinux/patches/patch-com32_lua_src_lua_c32 create mode 100644 package/syslinux/patches/patch-com32_mboot_mboot_c32 create mode 100644 package/syslinux/patches/patch-com32_menu_menu_c32 create mode 100644 package/syslinux/patches/patch-com32_menu_vesamenu_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cat_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_chain_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cmd_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_config_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cpuid_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_cpuidtest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_disk_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_dmitest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_elf_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ethersel_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_gpxecmd_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_host_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ifcpu64_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ifcpu_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ifplop_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_kbdmap_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_linux_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_ls_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_meminfo_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_pcitest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_pmload_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_pwd_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_sanboot_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_sdi_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_vesainfo_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_vpdtest_c32 create mode 100644 package/syslinux/patches/patch-com32_modules_whichsys_c32 create mode 100644 package/syslinux/patches/patch-com32_rosh_rosh_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_advdump_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_entrydump_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_fancyhello_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_fancyhello_lnx create mode 100644 package/syslinux/patches/patch-com32_samples_hello_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_keytest_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_keytest_lnx create mode 100644 package/syslinux/patches/patch-com32_samples_resolv_c32 create mode 100644 package/syslinux/patches/patch-com32_samples_serialinfo_c32 create mode 100644 package/syslinux/patches/patch-com32_sysdump_sysdump_c32 create mode 100644 package/tinc/patches/patch-src_Makefile_in delete mode 100644 package/tslib/patches/patch-ltmain_sh create mode 100644 package/tzdata/patches/patch-Makefile create mode 100644 package/vnc-reflector/patches/patch-Makefile create mode 100644 package/vnstat/patches/patch-src_Makefile create mode 100644 package/xbindkeys/patches/patch-Makefile_in create mode 100644 package/xf86-input-evtouch/patches/patch-configure create mode 100644 package/xfsprogs/patches/patch-configure create mode 100644 package/xfsprogs/patches/patch-copy_xfs_copy_c create mode 100644 package/xfsprogs/patches/patch-fsr_xfs_fsr_c create mode 100644 package/xfsprogs/patches/patch-libxfs_linux_c delete mode 100644 package/xinetd/patches/ar.patch delete mode 100644 package/xinetd/patches/destdir.patch create mode 100644 package/xinetd/patches/patch-Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_misc_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_portable_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_pset_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_sio_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_str_Makefile_in create mode 100644 package/xinetd/patches/patch-libs_src_xlog_Makefile_in (limited to 'package') diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 5eeeac943..f9f12f0be 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -20,13 +20,13 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -INSTALL_STYLE:= manual +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual -TCFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \ - -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\" -TLDFLAGS+= -pthread -lresolv -MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' LDFLAGS='${TLDFLAGS}' +TARGET_CPPFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \ + -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\" +TARGET_LDFLAGS+= -pthread -lresolv +MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' do-install: $(INSTALL_DIR) $(IDIR_AICCU)/usr/sbin $(IDIR_AICCU)/etc diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 0317fdf7d..873594dea 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alix-switch PKG_VERSION:= 1.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_DESCR:= daemon listening on button events PKG_SECTION:= base PKG_URL:= http://openadk.org/ @@ -20,8 +20,10 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CFLAGS+= -Wall + do-build: - ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \ + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ -o ${WRKBUILD}/alix-switchd ${WRKBUILD}/alix-switchd.c do-install: diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 722faae9d..32730f11d 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= arpd PKG_VERSION:= 0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d PKG_DESCR:= Generates ARP responses for IP address ranges PKG_SECTION:= route @@ -23,9 +23,9 @@ $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_ARGS+= --with-libdnet=${STAGING_TARGET_DIR}/usr \ --with-libevent=${STAGING_TARGET_DIR}/usr \ --with-libpcap=${STAGING_TARGET_DIR}/usr -MAKE_FLAGS+= CFLAGS="${TCFLAGS}" \ - INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" \ - LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lpcap -ldnet -levent" +MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS}" \ + INCLS="-I. ${TARGET_CPPFLAGS}" \ + LIBS="-lpcap -ldnet -levent" post-install: ${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 2b1fc70a5..73ac40acb 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -84,7 +84,7 @@ endif ifneq (${ADK_PACKAGE_ASTERISK_FORMAT_VORBIS},) CONFIGURE_ARGS+= --with-ogg=${STAGING_TARGET_DIR}/usr \ --with-vorbis=${STAGING_TARGET_DIR}/usr -TLDFLAGS+= -logg +TARGET_LDFLAGS+= -logg endif ifneq (${ADK_PACKAGE_ASTERISK_CURL},) CONFIGURE_ARGS+= --with-libcurl=${STAGING_TARGET_DIR}/usr @@ -99,12 +99,11 @@ endif INSTALL_STYLE:= manual -TLDFLAGS+= -lm -MAKE_ENV= ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \ - ASTLDFLAGS="${TLDFLAGS}" +TARGET_LDFLAGS+= -lm +MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ + ASTLDFLAGS="${TARGET_LDFLAGS}" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_OPTIMIZATION}" \ - STRIP="${TARGET_CROSS}strip" \ NOISY_BUILD=1 ALL_TARGET:= all install samples diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 601e9aba3..e7d759066 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -16,19 +16,20 @@ PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ PKG_SUBPKGS:= ATFTP ATFTPD PKGSD_ATFTPD:= TFTP server +PKGSS_ATFTPD:= libreadline libncurses include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ATFTPD},${PKG_SECTION})) -MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline" +MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} -Wall -D_REENTRANT -fno-inline" -post-install: - # atftp client +atftp-install: $(INSTALL_DIR) $(IDIR_ATFTP)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin - # atftp server + +atftpd-install: $(INSTALL_DIR) $(IDIR_ATFTPD)/usr/sbin $(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile index f42767dbe..83e39c26e 100644 --- a/package/aufs2-util/Makefile +++ b/package/aufs2-util/Makefile @@ -29,7 +29,7 @@ $(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}, $(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION})) CONFIG_STYLE:= manual -XAKE_FLAGS+= Install=install HOSTCPPFLAGS="-I${LINUX_HEADER_DIR}/include" +XAKE_FLAGS+= Install=install CPPFLAGS_FOR_BUILD="-I${LINUX_HEADER_DIR}/include" post-install: $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/sbin diff --git a/package/aufs2-util/patches/patch-Makefile b/package/aufs2-util/patches/patch-Makefile index d77ea81ec..6a8f74806 100644 --- a/package/aufs2-util/patches/patch-Makefile +++ b/package/aufs2-util/patches/patch-Makefile @@ -4,10 +4,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+c2sh c2tmac: CC = ${HOSTCC} -+c2sh c2tmac: CFLAGS= ${HOSTCFLAGS} -+c2sh c2tmac: LDFLAGS= ${HOSTLDFLAGS} -+c2sh c2tmac: CPPFLAGS= ${HOSTCPPFLAGS} -I./libau -I${LINUX_HEADER_DIR}/include ++c2sh c2tmac: CC = ${CC_FOR_BUILD} ++c2sh c2tmac: CFLAGS= ${CFLAGS_FOR_BUILD} ++c2sh c2tmac: LDFLAGS= ${LDFLAGS_FOR_BUILD} ++c2sh c2tmac: CPPFLAGS= ${CPPFLAGS_FOR_BUILD} -I./libau -I${LINUX_HEADER_DIR}/include + CFLAGS += -I./libau CFLAGS += -O -Wall diff --git a/package/avahi/Makefile b/package/avahi/Makefile index ebd811ca9..05ef2a39c 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -26,7 +26,7 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI})) -TLDFLAGS+= -lintl +TARGET_LDFLAGS+= -lintl CONFIGURE_ARGS+= --enable-glib \ --disable-qt3 \ --disable-qt4 \ diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 62dbb7226..2d02e722e 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -29,9 +29,7 @@ CONFIG_STYLE:= manual INSTALL_STYLE:= manual XAKE_FLAGS+= STRIP='' \ - CC='${TARGET_CC}' \ - OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \ - OPT_LDFLAGS="" + CC='${TARGET_CC}' do-configure: ${CP} ./files/config ${WRKBUILD}/config/.config diff --git a/package/bind/Makefile b/package/bind/Makefile index 278982c4b..2e44d787b 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -51,45 +51,46 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -pre-build: - ${MAKE} -C ${WRKBUILD}/lib/dns \ - BUILD_CC="${HOSTCC}" \ - CC="${HOSTCC}" \ - CFLAGS='${HOSTCFLAGS}' \ - gen - -post-install: - # bind server +CONFIGURE_ENV+= BUILD_CC="${CC_FOR_BUILD}" BUILD_CFLAGS='${CFLAGS_FOR_BUILD}' + +bind-server-install: ${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc ${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/ ${CP} ./files/bind ${IDIR_BIND_SERVER}/etc - # nsupdate + +bind-client-install: ${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/ - # rndc + +bind-rndc-install: ${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen \ ${IDIR_BIND_RNDC}/usr/sbin/ - # bind check + +bind-check-install: ${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \ ${IDIR_BIND_CHECK}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \ ${IDIR_BIND_CHECK}/usr/sbin/ - # dnsec tools + +bind-dnssec-install: ${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \ ${IDIR_BIND_DNSSEC}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \ ${IDIR_BIND_DNSSEC}/usr/sbin/ - # host + +bind-host-install: ${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_HOST}/usr/bin/ - # dig + +bind-dig-install: ${INSTALL_DIR} ${IDIR_BIND_DIG}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/ - # bind lib + +libbind-install: ${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib ${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/ ${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/ diff --git a/package/binutils/Makefile b/package/binutils/Makefile index b076323d5..dd970c6c3 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD})) -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-werror \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 41b56a5ca..77bf2246f 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= minimal -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ --prefix=/usr/ \ --bindir=/usr/sbin/ \ diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index b94a29059..990bf1178 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -17,8 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual - -TCFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC XAKE_FLAGS+= PREFIX=${WRKINST}/usr post-install: diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index 7a42d671f..b63b87751 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -24,8 +24,8 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - ${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -c -o ${WRKBUILD}/cryptinit.o \ - ${WRKBUILD}/cryptinit.c + ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} -c \ + -o ${WRKBUILD}/cryptinit.o ${WRKBUILD}/cryptinit.c ( cd ${WRKBUILD}; \ ${TARGET_CC} -static -o cryptinit cryptinit.o \ ${STAGING_TARGET_DIR}/usr/lib/libcryptsetup.a \ diff --git a/package/cups/Makefile b/package/cups/Makefile index aa3bea6fd..8f764ba1b 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= ac_cv_func_sigset=no \ - OPTIM='-fPIC $(TARGET_CFLAGS)' + OPTIM='-fPIC' CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --disable-ssl FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" -XAKE_FLAGS+= OPTIM='-fPIC $(TARGET_CFLAGS)' +XAKE_FLAGS+= OPTIM='-fPIC' post-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin diff --git a/package/cutter/Makefile b/package/cutter/Makefile index 0cf8a1c74..69af2e4ce 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -22,9 +22,11 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CFLAGS+= -Wall + do-build: - ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} ${WRKBUILD}/cutter.c \ - -o ${WRKBUILD}/cutter + ${TARGET_CC} ${TARGET_