diff options
| -rw-r--r-- | mk/vars.mk | 11 | ||||
| -rw-r--r-- | package/cfgfs/Makefile | 3 | ||||
| -rw-r--r-- | package/libthread_db/Makefile | 8 |
3 files changed, 12 insertions, 10 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 300e41aae..39c35e52a 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -57,6 +57,12 @@ TARGET_LDFLAGS:= -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ -L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib +ifneq ($(ADK_NATIVE),) +TARGET_CPPFLAGS:= +TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts +TARGET_LDFLAGS:= +endif + ifneq ($(ADK_STATIC),) TARGET_CFLAGS+= -static TARGET_CXXFLAGS+= -static @@ -81,11 +87,6 @@ else TARGET_CFLAGS+= -fomit-frame-pointer $(TARGET_OPTIMIZATION) endif -ifneq ($(ADK_NATIVE),) -TARGET_CPPFLAGS:= -TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts -TARGET_LDFLAGS:= -endif # A nifty macro to make testing gcc features easier (from uClibc project) check_gcc=$(shell \ diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 0b83d3192..2d824e1bb 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.8 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base PKG_URL:= http://openadk.org/ @@ -14,7 +14,6 @@ PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@ PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ -PKG_CFLINE_CFGFS+= select BUSYBOX_DIFF@ PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS PKG_DFLT_CFGFS:= y if !(ADK_TOOLCHAIN_ONLY || ADK_HARDWARE_QEMU) diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index aa37c78b1..394830998 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk ifeq ($(ADK_TARGET_LIB_GLIBC),y) include ${TOPDIR}/toolchain/glibc/Makefile.inc -else +endif ifeq ($(ADK_TARGET_LIB_EGLIBC),y) include ${TOPDIR}/toolchain/eglibc/Makefile.inc -else -include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif +ifeq ($(ADK_TARGET_LIB_UCLIBC),y) +include ${TOPDIR}/toolchain/uClibc/Makefile.inc endif PKG_NAME:= libthread-db @@ -28,7 +28,9 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: +ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib ${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib +endif include ${TOPDIR}/mk/pkg-bottom.mk |