From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B1E8139695 for ; Wed, 26 Apr 2017 18:15:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25F6FE0BC1; Wed, 26 Apr 2017 18:15:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8EE3E0C08 for ; Wed, 26 Apr 2017 18:15:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65842341689 for ; Wed, 26 Apr 2017 18:14:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCA3C7442 for ; Wed, 26 Apr 2017 18:14:57 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1493230449.c25bd87dfe740a26b0d57cf0c1c2098745b1b39e.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/, sys-libs/libsemanage/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch sys-libs/libsemanage/libsemanage-9999.ebuild X-VCS-Directories: sys-libs/libsemanage/files/ sys-libs/libsemanage/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: c25bd87dfe740a26b0d57cf0c1c2098745b1b39e X-VCS-Branch: master Date: Wed, 26 Apr 2017 18:14:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d58c3257-0ce2-4bdc-aeb8-ddca1094ce31 X-Archives-Hash: bf76e5152d0a968bc11a6c19f8c9a226 commit: c25bd87dfe740a26b0d57cf0c1c2098745b1b39e Author: Jason Zaman gentoo org> AuthorDate: Wed Apr 26 04:38:08 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Wed Apr 26 18:14:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25bd87d sys-libs/libsemanage: build paths patch is merged upstream Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/libsemanage-2.7-build-paths.patch | 37 ---------------------- sys-libs/libsemanage/libsemanage-9999.ebuild | 2 -- 2 files changed, 39 deletions(-) diff --git a/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch b/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch deleted file mode 100644 index 4c2ad0d9462..00000000000 --- a/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -there's no point in using -I/-L flags to the system paths and this breaks -cross-compiling. just drop them. - -diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile -index ef25902..7aad334 100644 ---- libsemanage/src/Makefile -+++ libsemanage/src/Makefile -@@ -61,7 +61,7 @@ CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format- - SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno-shadow \ - -Wno-unused-parameter - --override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -+override CFLAGS += -I../include -D_GNU_SOURCE - RANLIB ?= ranlib - - SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ -@@ -81,17 +81,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) - $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< - - $(SWIGSO): $(SWIGLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage $(PYLIBS) -L$(LIBDIR) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage $(PYLIBS) - - $(SWIGRUBYSO): $(SWIGRUBYLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage $(RUBYLIBS) -L$(LIBDIR) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage $(RUBYLIBS) - - $(LIBA): $(OBJS) - $(AR) rcs $@ $^ - $(RANLIB) $@ - - $(LIBSO): $(LOBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs - ln -sf $@ $(TARGET) - - $(LIBPC): $(LIBPC).in ../VERSION diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild index 786c3994ea4..085031fc41e 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-9999.ebuild @@ -71,8 +71,6 @@ src_prepare() { echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf" echo "bzip-small=true" >> "${S}/src/semanage.conf" - eapply "${FILESDIR}"/${PN}-2.7-build-paths.patch - eapply_user multilib_copy_sources