From 6776815ef8c53a8598552c2c429d93f12dd7e586 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 20 May 2014 19:53:14 +0200 Subject: disable pcc (broken), fix valgrind --- package/cxxtools/Makefile | 1 - package/dmidecode/Makefile | 4 ---- package/geoclue/Makefile | 29 ----------------------------- package/pcc-libs/Makefile | 5 ++++- package/pcc/Makefile | 2 ++ package/valgrind/patches/patch-configure_ac | 18 ++++++++++++++++-- 6 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 package/geoclue/Makefile (limited to 'package') diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index a61c71d9c..3fcddf392 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -16,7 +16,6 @@ PKG_NEED_CXX:= 1 PKG_CXX:= CXXTOOLS PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !arm !m68k DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${TOPDIR}/mk/package.mk diff --git a/package/dmidecode/Makefile b/package/dmidecode/Makefile index a7b574595..aa109710e 100644 --- a/package/dmidecode/Makefile +++ b/package/dmidecode/Makefile @@ -20,10 +20,6 @@ $(eval $(call PKG_template,DMIDECODE,dmidecode,$(PKG_VERSION)-${PKG_RELEASE},${P CONFIG_STYLE:= manual -ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) -TARGET_LDFLAGS+= -lssp -endif - dmidecode-install: $(INSTALL_DIR) $(IDIR_DMIDECODE)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/sbin/dmidecode \ diff --git a/package/geoclue/Makefile b/package/geoclue/Makefile deleted file mode 100644 index 113d400eb..000000000 --- a/package/geoclue/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# 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:= geoclue -PKG_VERSION:= 1.99.3 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 514efbecd69c78b3e0a3d86012b7d88c -PKG_DESCR:= D-Bus service that provides location information -PKG_SECTION:= libs -PKG_DEPENDS:= json-glib -PKG_BUILDDEP:= json-glib -PKG_URL:= http://www.freedesktop.org/wiki/Software/GeoClue/ -PKG_SITES:= http://www.freedesktop.org/software/geoclue/releases/1.99/ -PKG_OPTS:= dev - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,GEOCLUE,geoclue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -geoclue-install: - $(INSTALL_DIR) $(IDIR_GEOCLUE)/usr/lib - $(CP) $(WRKINST)/usr/lib/geoclue*.so* \ - $(IDIR_GEOCLUE)/usr/lib - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile index 16b05879e..fb5a4d625 100644 --- a/package/pcc-libs/Makefile +++ b/package/pcc-libs/Makefile @@ -7,11 +7,13 @@ PKG_NAME:= pcc-libs PKG_VERSION:= 1.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= a8dfcd6d3be512bc3f16f96c9abf132e -PKG_DESCR:= Runtime for the Portable C Compiler +PKG_DESCR:= runtime for the Portable C Compiler PKG_SECTION:= lang PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ +PKG_CFLINE_PCC_LIBS:= depends on ADK_BROKEN + PKG_ARCH_DEPENDS:= !arm !m68k !mips !ppc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz @@ -19,6 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PCC_LIBS,pcc-libs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS)) # we cross-compile a native compiler for the target system CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME} CONFIGURE_ARGS+= --target=${GNU_TARGET_NAME} diff --git a/package/pcc/Makefile b/package/pcc/Makefile index ef3e70b28..531f14613 100644 --- a/package/pcc/Makefile +++ b/package/pcc/Makefile @@ -14,6 +14,8 @@ PKG_URL:= http://pcc.ludd.ltu.se/ PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ PKG_NOPARALLEL:= 1 +PKG_CFLINE_PCC:= depends on ADK_BROKEN + PKG_ARCH_DEPENDS:= !arm !m68k !mips !ppc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/valgrind/patches/patch-configure_ac b/package/valgrind/patches/patch-configure_ac index cc7286c90..1e5eb9f6a 100644 --- a/package/valgrind/patches/patch-configure_ac +++ b/package/valgrind/patches/patch-configure_ac @@ -1,5 +1,5 @@ --- valgrind-3.9.0.orig/configure.ac 2013-11-01 00:28:16.000000000 +0100 -+++ valgrind-3.9.0/configure.ac 2014-03-17 14:18:45.000000000 +0100 ++++ valgrind-3.9.0/configure.ac 2014-05-19 19:33:23.000000000 +0200 @@ -155,6 +155,7 @@ esac # configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_* # variables used when compiling C files. @@ -61,7 +61,21 @@ AC_MSG_CHECKING([the GLIBC_VERSION version]) -@@ -928,10 +950,13 @@ case "${GLIBC_VERSION}" in +@@ -918,6 +940,13 @@ case "${GLIBC_VERSION}" in + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.19) ++ AC_MSG_RESULT(2.19 family) ++ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) +@@ -928,10 +957,13 @@ case "${GLIBC_VERSION}" in AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" ;; -- cgit v1.2.3