diff options
| -rw-r--r-- | package/dbus/Makefile | 5 | ||||
| -rw-r--r-- | package/libstdcxx/Makefile | 1 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 2 | ||||
| -rw-r--r-- | package/pcre/Makefile | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 552a12122..de0ed663c 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a70edc50524f258eaf5c9a9994ed8748 PKG_DESCR:= DBUS library and daemon PKG_SECTION:= libs -PKG_DEPENDS:= libexpat libx11 -PKG_BUILDDEP:= expat libX11 +PKG_DEPENDS:= libexpat libx11 libuuid +PKG_BUILDDEP:= expat libX11 util-linux PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ @@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS})) +TARGET_LDFLAGS+= -luuid TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-tests \ --disable-abstract-sockets \ diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 44f5becd0..fddf9656b 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -34,6 +34,7 @@ ifeq ($(ADK_NATIVE),y) else (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so.6) (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so) + (cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.17 libstdc++.so) $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} -@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py endif diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index cd84e98a3..8fa2aff9c 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -20,7 +20,7 @@ WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} PKG_HOST_DEPENDS:= !darwin !cygwin !openbsd !netbsd !freebsd PKG_ARCH_DEPENDS:= arm mips x86 x86_64 -PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx +PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong PKG_SUBPKGS:= OPENJDK7 PKG_CHOICES_OPENJDK7:= ZERO SHARK CACAO diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 80e856b57..d81eb7c06 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -24,6 +24,7 @@ $(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},$ $(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRE_DEV},${PKGSC_LIBPCRE_DEV})) XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32 -lintl libpcre-install: ${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib |