diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-20 18:59:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-20 18:59:40 +0200 |
| commit | 6412c41158515b8d1ec02056d076bbd0d6c07a06 (patch) | |
| tree | f0221a1f292752b85e57fd62ebece065c8be29a8 | |
| parent | 805407432ca9328faf20214acdf73d88e2eb0c95 (diff) | |
fix heimdal musl compile
| -rw-r--r-- | package/heimdal/Makefile | 1 | ||||
| -rw-r--r-- | package/heimdal/files/patch-lib_asn1_Makefile.in | 12 | ||||
| -rw-r--r-- | package/heimdal/patches/patch-tools_krb5-config.in | 20 |
3 files changed, 33 insertions, 0 deletions
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 1647234a5..4c3337a08 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -76,6 +76,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin CONFIGURE_ENV+= ac_cv_func_getaddrinfo_numserv=yes post-extract: + (cd $(WRKBUILD);patch -p1 < $(TOPDIR)/package/heimdal/files/patch-lib_asn1_Makefile.in) (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure --prefix=$(STAGING_HOST_DIR) \ --disable-pk-init \ diff --git a/package/heimdal/files/patch-lib_asn1_Makefile.in b/package/heimdal/files/patch-lib_asn1_Makefile.in new file mode 100644 index 000000000..490b6057f --- /dev/null +++ b/package/heimdal/files/patch-lib_asn1_Makefile.in @@ -0,0 +1,12 @@ +diff -Nur heimdal-1.5.2.orig/lib/asn1/Makefile.in heimdal-1.5.2/lib/asn1/Makefile.in +--- heimdal-1.5.2.orig/lib/asn1/Makefile.in 2012-01-11 14:04:24.000000000 +0100 ++++ heimdal-1.5.2/lib/asn1/Makefile.in 2013-08-20 08:22:27.576686750 +0200 +@@ -457,7 +457,7 @@ + top_srcdir = @top_srcdir@ + SUFFIXES = .et .h .x .z .hx .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include +-AM_CPPFLAGS = $(INCLUDES_roken) ++AM_CPPFLAGS = $(INCLUDES_roken) -I$(top_builddir)/lib/com_err + @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME + AM_CFLAGS = $(WFLAGS) + CP = cp diff --git a/package/heimdal/patches/patch-tools_krb5-config.in b/package/heimdal/patches/patch-tools_krb5-config.in new file mode 100644 index 000000000..76f1ac7e5 --- /dev/null +++ b/package/heimdal/patches/patch-tools_krb5-config.in @@ -0,0 +1,20 @@ +diff -Nur heimdal-1.5.2.orig/tools/krb5-config.in heimdal-1.5.2/tools/krb5-config.in +--- heimdal-1.5.2.orig/tools/krb5-config.in 2012-01-10 22:53:51.000000000 +0100 ++++ heimdal-1.5.2/tools/krb5-config.in 2013-08-20 09:44:59.580220171 +0200 +@@ -120,7 +120,6 @@ + fi + + if test "$do_libs" = "yes"; then +- lib_flags="-L${libdir}" + case $library in + gssapi) + lib_flags="$lib_flags -lgssapi -lheimntlm" +@@ -142,7 +141,7 @@ + echo $lib_flags + fi + if test "$do_cflags" = "yes"; then +- echo "-I${includedir} @INCLUDE_hcrypto@" ++ echo "@INCLUDE_hcrypto@" + fi + + exit 0 |