summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wulf C. Krueger <philantrop@exherbo.org> 2015-03-30 01:13:25 +0200
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2015-03-30 01:13:25 +0200
commit58eeb3ba1124524a0f673a0192671f6618ca8bee (patch)
treea08c62b2b48740e9d556f97ed7a6befd5cd536a5
parentfd7d30873c857376f84dbb2a8056fd32660e4c46 (diff)
downloadarbor-58eeb3ba1124524a0f673a0192671f6618ca8bee.tar.gz
arbor-58eeb3ba1124524a0f673a0192671f6618ca8bee.tar.xz
libmilter: cross adjustments
-rw-r--r--packages/mail-filter/libmilter/files/exherbo.config.m43
-rw-r--r--packages/mail-filter/libmilter/libmilter-1.0.2-r2.exheres-013
2 files changed, 11 insertions, 5 deletions
diff --git a/packages/mail-filter/libmilter/files/exherbo.config.m4 b/packages/mail-filter/libmilter/files/exherbo.config.m4
index c214780..da1e6a4 100644
--- a/packages/mail-filter/libmilter/files/exherbo.config.m4
+++ b/packages/mail-filter/libmilter/files/exherbo.config.m4
@@ -1,5 +1,8 @@
+define(`confAR', ``@@AR@@'')
define(`confCC', ``@@CC@@'')
define(`confLD', ``@@LD@@'')
+define(`confINCLUDEDIR', ``@@INCLUDEDIR@@'')
+define(`confLIBDIR', ``@@LIBDIR@@'')
APPENDDEF(`confENVDEF', ``-DNETINET -DNETUNIX -DNETINET6'')
APPENDDEF(`confCCOPTS', ``@@CFLAGS@@'')
APPENDDEF(`confLDOPTS', ``@@LDFLAGS@@'')
diff --git a/packages/mail-filter/libmilter/libmilter-1.0.2-r2.exheres-0 b/packages/mail-filter/libmilter/libmilter-1.0.2-r2.exheres-0
index 30eaf6b..3b3b7f7 100644
--- a/packages/mail-filter/libmilter/libmilter-1.0.2-r2.exheres-0
+++ b/packages/mail-filter/libmilter/libmilter-1.0.2-r2.exheres-0
@@ -29,7 +29,7 @@ BUGS_TO="will@worrbase.com philantrop@exherbo.org"
DEFAULT_SRC_INSTALL_PARAMS=(
"MILTER_SOVER=${PV}"
"MANROOT=/usr/share/man/man"
- "LIBDIR=/usr/${LIBDIR}"
+ "LIBDIR=/usr/$(exhost --target)/lib"
)
DEFAULT_SRC_PREPARE_PATCHES=(
@@ -41,11 +41,14 @@ DEFAULT_SRC_PREPARE_PATCHES=(
WORK=${WORKBASE}/${SENDMAIL_PNV}
src_compile() {
- edo sed -e "s:@@CFLAGS@@:${CFLAGS}:" \
+ edo sed -e "s:@@AR@@:$(exhost --target)-ar:" \
+ -e "s:@@CFLAGS@@:${CFLAGS}:" \
-e "s:@@LDFLAGS@@:${LDFLAGS}:" \
-e "s:@@CC@@:${CC}:" \
- -e "s:@@LD@@:${LD}:" "${FILES}/exherbo.config.m4" > \
- devtools/Site/site.config.m4
+ -e "s:@@LD@@:${LD}:" \
+ -e "s:@@INCLUDEDIR@@:/usr/$(exhost --target)/include:" \
+ -e "s:@@LIBDIR@@:/usr/$(exhost --target)/lib:" \
+ "${FILES}/exherbo.config.m4" > devtools/Site/site.config.m4
edo pushd "${WORK}/libmilter"
edo sh Build MILTER_SOVER=${PV}
@@ -54,7 +57,7 @@ src_compile() {
src_install() {
edo pushd "${WORK}/libmilter"
- edo mkdir -p "${IMAGE}/usr/${LIBDIR}"
+ edo mkdir -p "${IMAGE}"/usr/$(exhost --target)/lib
default
dodoc -r docs
edo popd