From 1133719749afb61faf8974c87e41c14384b03444 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 22:13:29 +0100 Subject: disable for musl (aiccu, atftp), fix pcc typo --- package/aiccu/Makefile | 4 +++- package/aiccu/patches/patch-common_common_h | 12 ++++++++++++ package/aiccu/src/common/dn_skipname.c | 10 +++++----- package/atftp/Makefile | 2 ++ package/pcc/Makefile | 12 +++++------- 5 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 package/aiccu/patches/patch-common_common_h (limited to 'package') diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index d009394f7..407c3a65c 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= aiccu PKG_VERSION:= 20070115 -PKG_RELEASE:= 10 +PKG_RELEASE:= 11 PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility PKG_SECTION:= ipv6 @@ -13,6 +13,8 @@ PKG_DEPENDS:= kmod-ipv6 kmod-tun libpthread PKG_URL:= http://www.sixxs.net/ PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ +PKG_LIBC_DEPENDS:= uclibc glibc + DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz WRKDIST= ${WRKDIR}/$(PKG_NAME) diff --git a/package/aiccu/patches/patch-common_common_h b/package/aiccu/patches/patch-common_common_h new file mode 100644 index 000000000..42cd7b5a2 --- /dev/null +++ b/package/aiccu/patches/patch-common_common_h @@ -0,0 +1,12 @@ +--- aiccu.orig/common/common.h 2007-01-11 15:50:51.000000000 +0100 ++++ aiccu/common/common.h 2014-03-16 21:47:28.000000000 +0100 +@@ -91,7 +91,9 @@ + #include + + #include ++#ifdef __GLIBC__ + #include ++#endif + #ifdef linux + #include + #include diff --git a/package/aiccu/src/common/dn_skipname.c b/package/aiccu/src/common/dn_skipname.c index f2219f335..3b4a756b9 100644 --- a/package/aiccu/src/common/dn_skipname.c +++ b/package/aiccu/src/common/dn_skipname.c @@ -9,10 +9,10 @@ * return: * 0 on success, -1 (with errno set) on failure. */ -int ns_name_skip(const u_char **ptrptr, const u_char *eom) +int ns_name_skip(const unsigned char **ptrptr, const unsigned char *eom) { - const u_char *cp; - u_int n; + const unsigned char *cp; + unsigned int n; cp = *ptrptr; while (cp < eom && (n = *cp++) != 0) @@ -40,9 +40,9 @@ int ns_name_skip(const u_char **ptrptr, const u_char *eom) return (0); } -int dn_skipname(const u_char *ptr, const u_char *eom) +int dn_skipname(const unsigned char *ptr, const unsigned char *eom) { - const u_char *saveptr = ptr; + const unsigned char *saveptr = ptr; if(ns_name_skip(&ptr, eom) == -1) return (-1); diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 598f58a06..7d5eefa66 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= readline ncurses PKG_URL:= http://freshmeat.net/projects/atftp/ PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ +PKG_LIBC_DEPENDS:= uclibc glibc + PKG_SUBPKGS:= ATFTP ATFTPD PKGSD_ATFTPD:= TFTP server PKGSS_ATFTPD:= libreadline libncurses diff --git a/package/pcc/Makefile b/package/pcc/Makefile index 891651d3a..ef3e70b28 100644 --- a/package/pcc/Makefile +++ b/package/pcc/Makefile @@ -22,19 +22,17 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PCC,pcc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # we cross-compile a native compiler for the target system -CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME} -CONFIGURE_ARGS+= --target=${GNU_TARGET_NAME} -CONFIGURE_ARGS+= --with-assembler=/usr/bin/as -CONFIGURE_ARGS+= --with-linker=/usr/bin/ld +CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME} \ + --target=${GNU_TARGET_NAME} \ + --with-assembler=/usr/bin/as \ + --with-linker=/usr/bin/ld ifeq ($(ADK_TARGET_LIB_GLIBC),y) TARGET_CPPFLAGS+= -DADK_FOR_GLIBC -else +endif ifeq ($(ADK_TARGET_LIB_UCLIBC),y) TARGET_CPPFLAGS+= -DADK_FOR_UCLIBC endif -endif -endif pcc-install: $(INSTALL_DIR) $(IDIR_PCC) -- cgit v1.2.3 From 186c1bd82b6a6a1b0fcd64456088ca50e37784d5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 08:21:53 +0100 Subject: fixups for x86_64 x32 toolchain, x86_64 32 still problematic - add a musl patch to recognize x86_64-foo-muslx32 - rework multilib configuration - remove explicit sjlj gcc configure, as suggested by the gcc docs - fix strace for x32 --- package/binutils/Makefile | 6 +++--- package/glibc/Makefile | 6 +++--- package/strace/patches/patch-desc_c | 14 +++++++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) (limited to 'package') diff --git a/package/binutils/Makefile b/package/binutils/Makefile index c23bac585..5734e198d 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -25,10 +25,10 @@ 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},${PKG_OPTS})) -ifeq ($(ADK_TARGET_WITH_MULTILIB),y) -CONFIGURE_ARGS+= --enable-multilib -else +ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64),) CONFIGURE_ARGS+= --disable-multilib +else +CONFIGURE_ARGS+= --enable-multilib endif TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 17c49f3af..92ccf8cd4 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -31,10 +31,10 @@ INSTALL_STYLE:= manual # compile nothing, glibc is already build in toolchain directory do-install: ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) - $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) + $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \ - $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin $(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin diff --git a/package/strace/patches/patch-desc_c b/package/strace/patches/patch-desc_c index 9cfb5f505..63a01023e 100644 --- a/package/strace/patches/patch-desc_c +++ b/package/strace/patches/patch-desc_c @@ -1,5 +1,5 @@ --- strace-4.8.orig/desc.c 2013-05-02 00:39:10.000000000 +0200 -+++ strace-4.8/desc.c 2014-02-25 15:16:36.000000000 +0100 ++++ strace-4.8/desc.c 2014-03-01 19:44:21.000000000 +0100 @@ -223,7 +223,7 @@ static const struct xlat perf_event_open { 0, NULL }, }; @@ -9,3 +9,15 @@ /* fcntl/lockf */ static void printflock64(struct tcb *tcp, long addr, int getlk) +@@ -255,7 +255,11 @@ printflock(struct tcb *tcp, long addr, i + #if SUPPORTED_PERSONALITIES > 1 + # ifdef X32 + if (current_personality == 0) { ++#if defined(__GLIBC__) + printflock64(tcp, addr, getlk); ++#else ++ printflock(tcp, addr, getlk); ++#endif + return; + } + # endif -- cgit v1.2.3