From 11a79e9aa21afcb17fedf24d214bc1ed20d8be86 Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Fri, 11 Feb 2022 16:28:34 +0300 Subject: [PATCH] Revert "postfix: fix build on macos" This reverts commit 9d8171aa0647a0e4c5f27004d3f4c982ac0d1ebe. --- mail/postfix/Makefile | 2 +- mail/postfix/patches/500-crosscompile.patch | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 9691a11750..aba96ca917 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postfix PKG_VERSION:=3.5.8 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/mail/postfix/patches/500-crosscompile.patch b/mail/postfix/patches/500-crosscompile.patch index 0988099a96..c7448a3a1a 100644 --- a/mail/postfix/patches/500-crosscompile.patch +++ b/mail/postfix/patches/500-crosscompile.patch @@ -5,17 +5,15 @@ case $# in # Officially supported usage. - 0) SYSTEM=`(uname -s) 2>/dev/null` -+ 0) SYSTEM="OpenWrt" ++ 0) SYSTEM="OpenWRT" RELEASE=`(uname -r) 2>/dev/null` # No ${x%%y} support in Solaris 11 /bin/sh RELEASE_MAJOR=`expr "$RELEASE" : '\([0-9]*\)'` || exit 1 -@@ -242,6 +242,17 @@ case "$SYSTEM" in +@@ -242,6 +242,15 @@ case "$SYSTEM" in esac case "$SYSTEM.$RELEASE" in -+ OpenWrt*) SYSTYPE=LINUX5 -+ AR="${CC-gcc}-ar" -+ RANLIB="${CC-gcc}-ranlib" ++ OpenWRT*) SYSTYPE=LINUX$RELEASE_MAJOR + SYSLIBS="$SYSLIBS -ldl" + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC}