From patchwork Tue Jun 9 10:14:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 482168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EAE9E1404A8 for ; Tue, 9 Jun 2015 20:15:05 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1671128BC9D; Tue, 9 Jun 2015 12:13:02 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E2E3D28BC62 for ; Tue, 9 Jun 2015 12:12:48 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .web. - helo: .mout.web. - helo-domain: .web.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.15.4]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 9 Jun 2015 12:12:48 +0200 (CEST) Received: from tenchi-htpc.lan ([91.66.247.224]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0LmcN9-1Zb3Oz3mr5-00aFwc; Tue, 09 Jun 2015 12:14:27 +0200 From: Dirk Neukirchen To: openwrt-devel@lists.openwrt.org Date: Tue, 9 Jun 2015 12:14:52 +0200 Message-Id: <1433844892-3823-1-git-send-email-dirkneukirchen@web.de> X-Mailer: git-send-email 2.4.2 X-Provags-ID: V03:K0:/EeGRDzsPpY+Xuqt6u3DDOinN5B112Z58W/Y3L6+QYNQEDTy/dy N0PEROlHwq14/2onJ2ihD71KUBBj3gpA6S203dkv5cD/z6QPJHPYmPD8d0NHJp44oi0/NT8 6AJ0bL65U28wR2fK5DhzVMM6p1ScXrG5/V7qt4xpR8lcjIzxJa8EGF3BsxcJPKAAgpHtZ1I tk0P7QOuqPCyi0uRnXK9w== X-UI-Out-Filterresults: notjunk:1; V01:K0:RPIem9znEPQ=:sGscz6Jr9wcBk1zjCSdohr kcQICABy2a+ogsCuGjL83mQAn7MpA4vcyWsqaAiYpb5HkbjOCKvNzmbm6zIbz+1SF05I38ctE Jyhuz6Hh36X3i0O872FzIDRmgr1ORXn6xhjw0b5rfEF2EP3GtnZE3E7nfzudzFjckbFMUBqkq SkQ7IdbK9NVd2iuNhUwH0VNODae4mEu/NH/pAeqOyYPqoBEzJIXu+ytfl2Gr/Hr0b54NSR8IE GkEoVHUur+zT5nwfS8XKnqdUHqQIrzZkEWqTFGD2kVRhZY703l9zyPep5FrcN48raPFWDRbTB OxQ1iDUuZ+9ImN59Sp2fzPu0RZuEWlcHdBOVGRUIJYP3d746D+NTpQSw+Cxg2s26mKlljUuGX 4FWoaQPWOGNsENePWB4t8fGRbalUdK0qk5Ug1r2GARNsbwDKmPw3zMDcBjOiE/lxWj0bnEuOK Syd2E2rlkRpeJ1BLfmbj4D6ad61dNaTIEljmBQggnfElK1KXNFTmgH/Camwr+QTvrB4JX8iBY YAOE3YSDvOjERSAHll318EYMbeU8TJQ9u7zhWmSgA6uv7uELInVWCnLVNmvZuddgZ76l6ZCk7 22G4tmq6g6aERxYxdyI8SvfZgr6N5UcKp7+LDzs/Zg13wvudLcFo8epd5NYdpVakRi1OEhzj+ mjdExe6Tkr8sF3sd3irpMFGclS/4+OHqF2FT/YeyiE6ICyg== Subject: [OpenWrt-Devel] [PATCH] samba36: remove host build paths X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" - fix iconv detection because it adds host paths - disable python detection (host python-config is found) iconv issue is reported by buildbot config.log + replicated locally see config.log in logs.tar.gz python issue observed locally on Arch Linux Signed-off-by: Dirk Neukirchen --- package/network/services/samba36/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index b39f484..d8b930c 100644 --- a/package/network/services/samba36/Makefile +++ b/package/network/services/samba36/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samba PKG_VERSION:=3.6.25 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \ http://ftp.samba.org/pub/samba/stable @@ -35,7 +35,7 @@ define Package/samba36-server CATEGORY:=Network TITLE:=Samba 3.6 SMB/CIFS server URL:=http://www.samba.org/ - DEPENDS:=+USE_GLIBC:librt + DEPENDS:=+USE_GLIBC:librt $(ICONV_DEPENDS) endef define Package/samba36-client @@ -83,7 +83,9 @@ CONFIGURE_VARS += \ samba_cv_have_setreuid=yes \ samba_cv_have_setresuid=yes \ ac_cv_header_zlib_h=no \ - samba_cv_zlib_1_2_3=no + samba_cv_zlib_1_2_3=no \ + ac_cv_path_PYTHON="" \ + ac_cv_path_PYTHON_CONFIG="" CONFIGURE_ARGS += \ --exec-prefix=/usr \ @@ -95,6 +97,7 @@ CONFIGURE_ARGS += \ --disable-static \ --disable-swat \ --disable-shared-libs \ + --with-libiconv="$(ICONV_PREFIX)" \ --with-codepagedir=/etc/samba \ --with-configdir=/etc/samba \ --with-included-iniparser \