summaryrefslogtreecommitdiff
path: root/mk/package.mk
diff options
context:
space:
mode:
authorLinux User <wbx@linux.(none)>2009-10-01 15:44:52 +0200
committerLinux User <wbx@linux.(none)>2009-10-01 15:44:52 +0200
commit1d2ddabc7b9d0b63887058f6799c281cfa1f1370 (patch)
tree3e332a0293df7fed64796e81398469ad4be9eaca /mk/package.mk
parent71c91ce903a90de852b5d66a27a673ff6e785cee (diff)
some native build fixes
- git package needs a better fix. but existing symlinks are broken build without perl - update curl to latest upstream, including libcurl-dev package - add libopenssl-dev package
Diffstat (limited to 'mk/package.mk')
-rw-r--r--mk/package.mk24
1 files changed, 19 insertions, 5 deletions
diff --git a/mk/package.mk b/mk/package.mk
index a9339b811..64884e4b4 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -7,17 +7,23 @@ ifeq ($(ADK_STATIC),y)
TCFLAGS:= ${TARGET_CFLAGS} -static
TCXXFLAGS:= ${TARGET_CFLAGS} -static
TCPPFLAGS:= ${TARGET_CPPFLAGS} -static
+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
-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
ifneq ($(ADK_DEBUG),)
CONFIGURE_ARGS+= --enable-debug
else
@@ -30,7 +36,11 @@ CONFIGURE_ARGS+= --disable-ipv6
endif
ifeq ($(ADK_NATIVE),y)
- CONFIG_SHELL='$(strip ${SHELL})'
+CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \
+ CFLAGS='$(strip ${TCFLAGS})' \
+ CXXFLAGS='$(strip ${TCXXFLAGS})' \
+ CPPFLAGS='$(strip ${TCPPFLAGS})' \
+ LDFLAGS='$(strip ${TLDFLAGS})'
else
CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
${HOST_CONFIGURE_OPTS} \
@@ -59,7 +69,11 @@ INSTALL_TARGET?= install
ifeq ($(ADK_NATIVE),y)
MAKE_ENV+= \
WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
- WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}'
+ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
+ CFLAGS='$(strip ${TCFLAGS})' \
+ CXXFLAGS='$(strip ${TCXXFLAGS})' \
+ CPPFLAGS='$(strip ${TCPPFLAGS})' \
+ LDFLAGS='$(strip ${TLDFLAGS})'
else
MAKE_ENV+= PATH='${TARGET_PATH}' \
${HOST_CONFIGURE_OPTS} \