summaryrefslogtreecommitdiff
path: root/package/heimdal
diff options
context:
space:
mode:
Diffstat (limited to 'package/heimdal')
-rw-r--r--package/heimdal/Makefile14
-rw-r--r--package/heimdal/patches/patch-lib_roken_Makefile_in2
2 files changed, 8 insertions, 8 deletions
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 9568237e0..0e027feae 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_OPTS+= --disable-pk-init \
--disable-kx509
endif
-TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et -pthread
+TARGET_CFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et -pthread
CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin
CONFIGURE_ENV+= cross_compiling=yes \
@@ -87,12 +87,12 @@ post-extract:
${MAKE} -C ${WRKBUILD}/lib/roken
${MAKE} -C ${WRKBUILD}/lib/vers
${MAKE} -C ${WRKBUILD}/lib/editline
- env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT)
- env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT)
- env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT)
- ${MAKE} -C ${WRKBUILD}/lib/roken install
- ${MAKE} -C ${WRKBUILD}/lib/asn1 install
- ${MAKE} -C ${WRKBUILD}/lib/sl install
+ ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) LDFLAGS="-all-static"
+ ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) LDFLAGS="-all-static"
+ ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) LDFLAGS="-all-static"
+ ${MAKE} -C ${WRKBUILD}/lib/roken install LDFLAGS="-all-static"
+ ${MAKE} -C ${WRKBUILD}/lib/asn1 install LDFLAGS="-all-static"
+ ${MAKE} -C ${WRKBUILD}/lib/sl install LDFLAGS="-all-static"
$(CP) $(STAGING_HOST_DIR)/libexec/heimdal/{slc,asn1_compile} \
$(STAGING_HOST_DIR)/bin
${MAKE} -C ${WRKBUILD}/lib/sl clean
diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in
index a702be6b7..a5b84a201 100644
--- a/package/heimdal/patches/patch-lib_roken_Makefile_in
+++ b/package/heimdal/patches/patch-lib_roken_Makefile_in
@@ -29,7 +29,7 @@
+ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
+
+make-roken$(EXEEXT): make-roken.c
-+ $(HOSTCC) $(HOSTCFLAGS) -I$(top_builddir)/include -DHAVE_CONFIG_H \
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I$(top_builddir)/include -DHAVE_CONFIG_H \
+ -o $@ $<
-@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in