diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
| commit | 1d18ffa427852084c6bf378eaa76c2e9116cdea7 (patch) | |
| tree | b9aa383048f908be017cdc260cb60fa3df5699e0 /mk | |
| parent | f3d0f13c125a7e24dda986656d42b4a28e2f8e70 (diff) | |
| parent | 4f14ea9a70f86fd29c59b617fa1449dd5b2f14ab (diff) | |
some adk devel corrections
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/package.mk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 19 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/mk/package.mk b/mk/package.mk index 85efb2838..3f0cc4a7d 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -3,23 +3,26 @@ 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 ifeq ($(ADK_DEBUG),) @@ -233,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}'; \ |