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 4694C138334 for ; Fri, 29 Nov 2019 18:27:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64672E08F5; Fri, 29 Nov 2019 18:27:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C55EE08F5 for ; Fri, 29 Nov 2019 18:27:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BFE8434D5A0 for ; Fri, 29 Nov 2019 18:27:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54CB026C for ; Fri, 29 Nov 2019 18:27:48 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1575052052.a52a222a24a7dfa9b27ab8bba8036433f5891cf7.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libspnav/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch X-VCS-Directories: dev-libs/libspnav/files/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: a52a222a24a7dfa9b27ab8bba8036433f5891cf7 X-VCS-Branch: master Date: Fri, 29 Nov 2019 18:27:48 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f841f25f-66e9-4d2a-ba4b-bb5cb924365b X-Archives-Hash: 4376b21dae6eb8126ca35b293fc9dba9 commit: a52a222a24a7dfa9b27ab8bba8036433f5891cf7 Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Nov 29 13:30:38 2019 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Fri Nov 29 18:27:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52a222a dev-libs/libspnav: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/13799 Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Sebastian Pipping gentoo.org> .../files/libspnav-0.2.2-custom-flags.patch | 75 ---------------------- .../libspnav/files/libspnav-0.2.2-makefile.patch | 27 -------- 2 files changed, 102 deletions(-) diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch b/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch deleted file mode 100644 index cc96655bf46..00000000000 --- a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in ---- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:34:01.448356249 +0100 -+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:39:20.229350669 +0100 -@@ -7,7 +7,8 @@ lib_so = $(soname).1 - - CC = gcc - AR = ar --CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. -+CFLAGS = $(opt) -fpic -I. -+LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) - - .PHONY: all - all: $(lib_a) $(lib_so) -@@ -16,7 +17,7 @@ $(lib_a): $(obj) - $(AR) rcs $@ $(obj) - - $(lib_so): $(obj) -- $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) -+ $(CC) $(LDFLAGS) -o $@ $(obj) - - %.o: $(srcdir)/%.c - $(CC) $(CFLAGS) -c $< -o $@ -diff -Npur libspnav-0.2.2.orig/configure libspnav-0.2.2/configure ---- libspnav-0.2.2.orig/configure 2012-01-31 22:34:01.448356249 +0100 -+++ libspnav-0.2.2/configure 2012-01-31 22:34:39.703355615 +0100 -@@ -4,6 +4,7 @@ echo 'configuring spacenav library...' - - PREFIX=/usr/local - OPT=yes -+LDOPT=yes - DBG=yes - X11=yes - -@@ -26,6 +27,11 @@ for arg; do - --disable-opt) - OPT=no;; - -+ --enable-ldopt) -+ LDOPT=yes;; -+ --disable-ldopt) -+ LDOPT=no;; -+ - --enable-debug) - DBG=yes;; - --disable-debug) -@@ -44,6 +50,8 @@ for arg; do - echo ' --disable-x11: disable X11 communication mode' - echo ' --enable-opt: enable speed optimizations (default)' - echo ' --disable-opt: disable speed optimizations' -+ echo ' --enable-ldopt: enable link optimizations (default)' -+ echo ' --disable-ldopt: disable link optimizations' - echo ' --enable-debug: include debugging symbols (default)' - echo ' --disable-debug: do not include debugging symbols' - echo 'all invalid options are silently ignored' -@@ -54,6 +62,7 @@ done - - echo " prefix: $PREFIX" - echo " optimize for speed: $OPT" -+echo " optimize link: $LDOPT" - echo " include debugging symbols: $DBG" - echo " x11 communication method: $X11" - echo "" -@@ -74,7 +83,11 @@ if [ "$DBG" = 'yes' ]; then - fi - - if [ "$OPT" = 'yes' ]; then -- echo 'opt = -O3' >>Makefile -+ echo "opt = ${CFLAGS:--O3}" >>Makefile -+fi -+ -+if [ "$LDOPT" = 'yes' ]; then -+ echo "ldopt = ${LDFLAGS}" >>Makefile - fi - - if [ "$X11" = 'yes' ]; then diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch b/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch deleted file mode 100644 index f65300c5f58..00000000000 --- a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in ---- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:40:36.619349333 +0100 -+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:41:52.554347975 +0100 -@@ -11,7 +11,7 @@ CFLAGS = $(opt) -I. - LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) - - .PHONY: all --all: $(lib_a) $(lib_so) -+all: $(lib_so) - - $(lib_a): $(obj) - $(AR) rcs $@ $(obj) -@@ -31,10 +31,10 @@ distclean: - rm -f $(obj) $(lib_a) $(lib_so) Makefile - - .PHONY: install --install: $(lib_a) $(lib_so) -- cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a) -- cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so) -- for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done -+install: $(lib_so) -+ mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include -+ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) -+ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done - - .PHONY: uninstall - uninstall: