From 6d26b19269a28ff576e872473cb3b4610a61fceb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 11 Oct 2009 19:36:32 +0200
Subject: make more apps statically linkable

- update libusb to latest upstream
- update bluez to latest upstream
- add a new PKG_OPTS option: libonly, useful for
  library only packages, which are not created, when
  static linking is choosen
---
 mk/package.mk    | 22 ++++++++++++++--------
 mk/pkg-bottom.mk |  2 ++
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'mk')

diff --git a/mk/package.mk b/mk/package.mk
index f1a044683..3f0cc4a7d 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,24 +3,28 @@
 
 all: build-all-pkgs
 
+TCFLAGS:=		${TARGET_CFLAGS}
+TCXXFLAGS:=		${TARGET_CFLAGS}
+TCPPFLAGS:=		${TARGET_CPPFLAGS}
+TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
+			-Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
+			-L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib
 ifeq ($(ADK_STATIC),y)
 TCFLAGS:=		${TARGET_CFLAGS} -static
 TCXXFLAGS:=		${TARGET_CFLAGS} -static
 TCPPFLAGS:=		${TARGET_CPPFLAGS} -static
+TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
+			-Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
+			-L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib \
+			-static
+endif
 ifeq ($(ADK_NATIVE),y)
 TCFLAGS:=
 TCXXFLAGS:=
 TCPPFLAGS:=
 TLDFLAGS:=
-else
-TCFLAGS:=		${TARGET_CFLAGS}
-TCXXFLAGS:=		${TARGET_CFLAGS}
-TCPPFLAGS:=		${TARGET_CPPFLAGS}
-TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
-			-Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
-			-L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib
-endif
 endif
+
 ifeq ($(ADK_DEBUG),)
 TCPPFLAGS+=		-DNDEBUG
 endif
@@ -232,7 +236,9 @@ ifeq (,$(filter noscripts,$(7)))
 		    >>'$${STAGING_PARENT}/pkg/$(1)'; \
 	done
 endif
+ifeq (,$(filter libonly,$(7)))
 	$${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
+endif
 
 clean-targets: clean-dev-$(1)
 
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 64baf190c..fba5ee1a2 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -120,7 +120,9 @@ endif
 		[[ -e $$a ]] || continue; \
 		$(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \
 	done
+ifeq (,$(filter libonly,${PKG_OPTS}))
 	@env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE)
+endif
 ifeq (,$(filter noremove,${PKG_OPTS}))
 	@if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \
 		cd '${STAGING_DIR}'; \
-- 
cgit v1.2.3