Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libezV24/files: libezV24-0.1.1-build.patch
Date: Tue, 15 Jan 2008 09:01:21
Message-Id: E1JEhfb-0004gY-4d@stork.gentoo.org
1 drac 08/01/15 09:01:19
2
3 Modified: libezV24-0.1.1-build.patch
4 Log:
5 Fix patch to stop pre-stripping libraries, to support multilib and amd64 stable wrt #202668.
6 (Portage version: 2.1.4)
7
8 Revision Changes Path
9 1.3 dev-libs/libezV24/files/libezV24-0.1.1-build.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libezV24/files/libezV24-0.1.1-build.patch?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libezV24/files/libezV24-0.1.1-build.patch?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libezV24/files/libezV24-0.1.1-build.patch?r1=1.2&r2=1.3
14
15 Index: libezV24-0.1.1-build.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libezV24/files/libezV24-0.1.1-build.patch,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- libezV24-0.1.1-build.patch 26 Aug 2006 22:52:56 -0000 1.2
22 +++ libezV24-0.1.1-build.patch 15 Jan 2008 09:01:18 -0000 1.3
23 @@ -1,19 +1,23 @@
24 ---- libezV24-0.1.1/Makefile
25 -+++ libezV24-0.1.1/Makefile
26 -@@ -19,68 +19,62 @@
27 +diff -ur libezV24-0.1.1.orig/Makefile libezV24-0.1.1/Makefile
28 +--- libezV24-0.1.1.orig/Makefile 2003-02-17 15:46:18.000000000 +0200
29 ++++ libezV24-0.1.1/Makefile 2008-01-15 10:47:13.000000000 +0200
30 +@@ -19,68 +19,63 @@
31 # the base name of the library
32 SOBASE = ezV24
33
34 -# define the destination OS (currently only linux)
35 -PLATFORM=__LINUX__
36 -
37 - # the base path where the file should be installed to.
38 - PREFIX = /usr/local
39 -
40 +-# the base path where the file should be installed to.
41 +-PREFIX = /usr/local
42 ++# the base paths where the files should be installed to.
43 ++PREFIX = /usr
44 ++LIBDIR = $(PREFIX)/lib
45 ++
46 +# an additional prefix for building RPM packages. NOTE: don't forget to add a
47 +# trailing slash!
48 +DESTDIR =
49 -+
50 +
51 # generate the name of the output file in dependence of the development state.
52 #
53 -ifeq "${RELEASE}" "DEBUG"
54 @@ -57,10 +61,10 @@
55 endif
56 endif
57
58 ++CC ?= gcc
59 +CPPFLAGS += -I.
60 +CFLAGS ?= -O2
61 +CFLAGS += -Wall
62 -+LDFLAGS ?= -s
63 +
64 # tools to build the static library
65 ARFLAGS = cru
66 @@ -69,11 +73,11 @@
67 -
68 -# concatinate the compile flags
69 -CFLAGS = $(C_FLAG) $(C_DEFS)
70 --
71 +AR ?= ar
72 +RANLIB ?= ranlib
73
74 -
75 +-
76 -# ------------------------------------------------------------------------
77 -# AUTOMATISCHE COMPILE-ANWEISUNGEN
78 -# ------------------------------------------------------------------------
79 @@ -94,7 +98,7 @@
80 all: shared static test-v24
81
82 shared: $(NAME)
83 -@@ -88,13 +82,13 @@
84 +@@ -88,13 +83,13 @@
85 static: $(LIBNAME)
86
87
88 @@ -113,7 +117,7 @@
89
90
91 # Abhängigkeiten des Source, jedoch dann ohne Generierungsanweisung, wenn
92 -@@ -111,14 +104,17 @@
93 +@@ -111,22 +106,27 @@
94 #
95
96 install:
97 @@ -126,31 +130,34 @@
98 - ln -s $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME);\
99 - ldconfig
100 + install -d -m 755 $(DESTDIR)$(PREFIX)/include/$(SOBASE)
101 -+ install -d -m 755 $(DESTDIR)$(PREFIX)/lib/
102 ++ install -d -m 755 $(DESTDIR)$(LIBDIR)
103 + install -m 644 ezV24.h $(DESTDIR)$(PREFIX)/include/$(SOBASE)/
104 -+ install -m 644 $(LIBNAME) $(DESTDIR)$(PREFIX)/lib/$(LIBNAME)
105 -+ install -m 755 $(NAME) $(DESTDIR)$(PREFIX)/lib/$(NAME)
106 -+ rm -f $(DESTDIR)$(PREFIX)/lib/$(SONAME) $(DESTDIR)$(PREFIX)/lib/$(PLAINNAME)
107 -+ ln -s $(NAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
108 -+ ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(PLAINNAME)
109 ++ install -m 644 $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
110 ++ install -m 755 $(NAME) $(DESTDIR)$(LIBDIR)/$(NAME)
111 ++ rm -f $(DESTDIR)$(PREFIX)/lib/$(SONAME) $(DESTDIR)$(LIBDIR)/$(PLAINNAME)
112 ++ ln -s $(NAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
113 ++ ln -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(PLAINNAME)
114 + if [ -z $$NO_LDCONFIG ]; then \
115 + $(LDCONFIG); \
116 + fi
117
118 uninstall:
119 rm -f $(PREFIX)/include/ezV24/*
120 -@@ -127,7 +122,9 @@
121 - rm -f $(PREFIX)/lib/$(LIBNAME)
122 - rm -f $(PREFIX)/lib/$(NAME)
123 - rm -f $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME)
124 + rmdir $(PREFIX)/include/ezV24
125 +- rm -f $(PREFIX)/lib/$(LIBNAME)
126 +- rm -f $(PREFIX)/lib/$(NAME)
127 +- rm -f $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME)
128 - ldconfig
129 ++ rm -f $(LIBDIR)/$(LIBNAME)
130 ++ rm -f $(LIBDIR)/$(NAME)
131 ++ rm -f $(LIBDIR)/$(SONAME) $(LIBDIR/$(PLAINNAME)
132 + if [ -z $$NO_LDCONFIG ]; then \
133 + $(LDCONFIG); \
134 + fi
135
136
137 # This entry is for packing a distribution tarball
138 -@@ -158,15 +156,15 @@
139 +@@ -157,7 +157,7 @@
140 # gcc -o test-v24 -Wall test-v24.c -l$(SOBASE)
141 #
142 test-v24: test-v24.c ezV24.h $(LIBNAME)
143 @@ -159,7 +166,7 @@
144
145
146 # --------------------------------------------------------------------------
147 - # ANDERE AUFGABEN
148 +@@ -165,7 +165,7 @@
149 # --------------------------------------------------------------------------
150
151 clean:
152
153
154
155 --
156 gentoo-commits@l.g.o mailing list