cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

postfix: fix musl compatibility

Browse Source 
The current package patches `makedefs` to probe for the existance
of the `nsl` and `resolv` libraries but uses the wrong variables
for the prefix, leading to `makedefs` probing the host directories,
not the staging dir ones.

Replace `$PKG_BUILD_DIR` with `$STAGING_DIR` to perform the library
tests in the correct directory.

Fixes the following error spotted by doing test builds against musl
which does not provide a `libnsl`:

    .../mips-openwrt-linux-musl/bin/ld: cannot find -lnsl
    collect2: error: ld returned 1 exit status
    make: *** [master] Error 1

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich
2015-06-26 14:51:16 +02:00
parent 3788dd697b
commit abcadcbede
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/postfix/Makefile
+2 -2
View File
@@ -1,5 +1,5 @@
# #
# Copyright (C) 2014 OpenWrt.org # Copyright (C) 2014-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=postfix PKG_NAME:=postfix
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/ PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/
PKG_VERSION:=3.0.1 PKG_VERSION:=3.0.1
PKG_MD5SUM:=3ec1416e7d4fba9566297c8fcf7a348c PKG_MD5SUM:=3ec1416e7d4fba9566297c8fcf7a348c
mail/postfix/patches/500-crosscompile.patch
+5 -5
View File
@@ -1,6 +1,6 @@
--- postfix-2.10.2/makedefs 2013-02-04 05:33:13.000000000 +0400 --- a/makedefs
+++ postfix-2.10.2_patched/makedefs 2013-11-19 22:48:50.528560454 +0400 +++ b/makedefs
@@ -190,9 +190,9 @@ @@ -190,9 +190,9 @@ error() {
case $# in case $# in
# Officially supported usage. # Officially supported usage.
@@ -13,7 +13,7 @@
case "$VERSION" in case "$VERSION" in
dcosx*) SYSTEM=$VERSION;; dcosx*) SYSTEM=$VERSION;;
esac;; esac;;
@@ -522,9 +522,9 @@ @@ -522,9 +522,9 @@ EOF
esac esac
for name in nsl resolv for name in nsl resolv
do do
@@ -21,7 +21,7 @@
+ for lib in /usr/lib64 /usr/lib64/* /usr/lib /usr/lib/* /lib /lib/* + for lib in /usr/lib64 /usr/lib64/* /usr/lib /usr/lib/* /lib /lib/*
do do
- test -e $lib/lib$name.a -o -e $lib/lib$name.so && { - test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
+ test -e $PKG_BUILD_DIR/$lib/lib$name.a -o -e $PKG_BUILD_DIR/$lib/lib$name.so && { + test -e $STAGING_DIR/$lib/lib$name.a -o -e $STAGING_DIR/$lib/lib$name.so && {
SYSLIBS="$SYSLIBS -l$name" SYSLIBS="$SYSLIBS -l$name"
break break
} }