| 1 |
sping 12/02/06 20:04:53 |
| 2 |
|
| 3 |
Added: libspnav-0.2.2-makefile.patch |
| 4 |
libspnav-0.2.2-custom-flags.patch |
| 5 |
Log: |
| 6 |
dev-libs/libspnav: 0.2.2 (bug #390427) |
| 7 |
|
| 8 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libspnav-0.2.2-makefile.patch |
| 17 |
=================================================================== |
| 18 |
diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in |
| 19 |
--- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:40:36.619349333 +0100 |
| 20 |
+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:41:52.554347975 +0100 |
| 21 |
@@ -11,7 +11,7 @@ CFLAGS = $(opt) -I. |
| 22 |
LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) |
| 23 |
|
| 24 |
.PHONY: all |
| 25 |
-all: $(lib_a) $(lib_so) |
| 26 |
+all: $(lib_so) |
| 27 |
|
| 28 |
$(lib_a): $(obj) |
| 29 |
$(AR) rcs $@ $(obj) |
| 30 |
@@ -31,10 +31,10 @@ distclean: |
| 31 |
rm -f $(obj) $(lib_a) $(lib_so) Makefile |
| 32 |
|
| 33 |
.PHONY: install |
| 34 |
-install: $(lib_a) $(lib_so) |
| 35 |
- cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a) |
| 36 |
- cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so) |
| 37 |
- for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done |
| 38 |
+install: $(lib_so) |
| 39 |
+ mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include |
| 40 |
+ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) |
| 41 |
+ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done |
| 42 |
|
| 43 |
.PHONY: uninstall |
| 44 |
uninstall: |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: libspnav-0.2.2-custom-flags.patch |
| 54 |
=================================================================== |
| 55 |
diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in |
| 56 |
--- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:34:01.448356249 +0100 |
| 57 |
+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:39:20.229350669 +0100 |
| 58 |
@@ -7,7 +7,8 @@ lib_so = $(soname).1 |
| 59 |
|
| 60 |
CC = gcc |
| 61 |
AR = ar |
| 62 |
-CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. |
| 63 |
+CFLAGS = $(opt) -fpic -I. |
| 64 |
+LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) |
| 65 |
|
| 66 |
.PHONY: all |
| 67 |
all: $(lib_a) $(lib_so) |
| 68 |
@@ -16,7 +17,7 @@ $(lib_a): $(obj) |
| 69 |
$(AR) rcs $@ $(obj) |
| 70 |
|
| 71 |
$(lib_so): $(obj) |
| 72 |
- $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) |
| 73 |
+ $(CC) $(LDFLAGS) -o $@ $(obj) |
| 74 |
|
| 75 |
%.o: $(srcdir)/%.c |
| 76 |
$(CC) $(CFLAGS) -c $< -o $@ |
| 77 |
diff -Npur libspnav-0.2.2.orig/configure libspnav-0.2.2/configure |
| 78 |
--- libspnav-0.2.2.orig/configure 2012-01-31 22:34:01.448356249 +0100 |
| 79 |
+++ libspnav-0.2.2/configure 2012-01-31 22:34:39.703355615 +0100 |
| 80 |
@@ -4,6 +4,7 @@ echo 'configuring spacenav library...' |
| 81 |
|
| 82 |
PREFIX=/usr/local |
| 83 |
OPT=yes |
| 84 |
+LDOPT=yes |
| 85 |
DBG=yes |
| 86 |
X11=yes |
| 87 |
|
| 88 |
@@ -26,6 +27,11 @@ for arg; do |
| 89 |
--disable-opt) |
| 90 |
OPT=no;; |
| 91 |
|
| 92 |
+ --enable-ldopt) |
| 93 |
+ LDOPT=yes;; |
| 94 |
+ --disable-ldopt) |
| 95 |
+ LDOPT=no;; |
| 96 |
+ |
| 97 |
--enable-debug) |
| 98 |
DBG=yes;; |
| 99 |
--disable-debug) |
| 100 |
@@ -44,6 +50,8 @@ for arg; do |
| 101 |
echo ' --disable-x11: disable X11 communication mode' |
| 102 |
echo ' --enable-opt: enable speed optimizations (default)' |
| 103 |
echo ' --disable-opt: disable speed optimizations' |
| 104 |
+ echo ' --enable-ldopt: enable link optimizations (default)' |
| 105 |
+ echo ' --disable-ldopt: disable link optimizations' |
| 106 |
echo ' --enable-debug: include debugging symbols (default)' |
| 107 |
echo ' --disable-debug: do not include debugging symbols' |
| 108 |
echo 'all invalid options are silently ignored' |
| 109 |
@@ -54,6 +62,7 @@ done |
| 110 |
|
| 111 |
echo " prefix: $PREFIX" |
| 112 |
echo " optimize for speed: $OPT" |
| 113 |
+echo " optimize link: $LDOPT" |
| 114 |
echo " include debugging symbols: $DBG" |
| 115 |
echo " x11 communication method: $X11" |
| 116 |
echo "" |
| 117 |
@@ -74,7 +83,11 @@ if [ "$DBG" = 'yes' ]; then |
| 118 |
fi |
| 119 |
|
| 120 |
if [ "$OPT" = 'yes' ]; then |
| 121 |
- echo 'opt = -O3' >>Makefile |
| 122 |
+ echo "opt = ${CFLAGS:--O3}" >>Makefile |
| 123 |
+fi |
| 124 |
+ |
| 125 |
+if [ "$LDOPT" = 'yes' ]; then |
| 126 |
+ echo "ldopt = ${LDFLAGS}" >>Makefile |
| 127 |
fi |
| 128 |
|
| 129 |
if [ "$X11" = 'yes' ]; then |
Archives