| 1 |
hwoarang 10/06/29 19:34:48 |
| 2 |
|
| 3 |
Added: xlockmore-5.31-ldflags.patch |
| 4 |
xlockmore-5.31-configure.in.patch |
| 5 |
Log: |
| 6 |
Version bump to 5.31. Use patch to respect ldflags |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xlockmore-5.31-ldflags.patch |
| 16 |
=================================================================== |
| 17 |
Index: xlockmore-5.31/modes/Makefile.in |
| 18 |
=================================================================== |
| 19 |
--- xlockmore-5.31.orig/modes/Makefile.in |
| 20 |
+++ xlockmore-5.31/modes/Makefile.in |
| 21 |
@@ -329,6 +329,7 @@ DEFS = @DEFS@ $(DEFINES) |
| 22 |
XLOCKINC = -I. -I.. -I$(top_srcdir) -I$(UTILDIR) -I../.. @XLOCKINC@ |
| 23 |
CFLAGS = @CFLAGS@ |
| 24 |
CXXFLAGS = @CXXFLAGS@ |
| 25 |
+LDFLAGS = @LDFLAGS@ |
| 26 |
#CFLAGS = -O |
| 27 |
#CFLAGS = -g |
| 28 |
XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) |
| 29 |
@@ -367,7 +368,7 @@ PURIFY = @PURIFY@ |
| 30 |
|
| 31 |
@MODULES@$(NORMMODULES) : %.xlk:%.o |
| 32 |
@MODULES@ $(RM) $@ |
| 33 |
-@MODULES@ $(CXX) $(CXXFLAGS) -shared -o $@ $< |
| 34 |
+@MODULES@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $< |
| 35 |
|
| 36 |
$(DOG)fire.xlk : $(DOG)xpm-ximage.o |
| 37 |
$(DOG)lament.xlk : $(DOG)xpm-ximage.o |
| 38 |
@@ -375,60 +376,60 @@ $(DOG)sballs.xlk : $(DOG)xpm-ximage.o |
| 39 |
|
| 40 |
@MODULES@@GL@$(DOG)fire.xlk $(DOG)lament.xlk $(DOG)sballs.xlk : %.xlk:%.o |
| 41 |
@MODULES@@GL@ $(RM) $@ |
| 42 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $< |
| 43 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $< |
| 44 |
|
| 45 |
$(DOG)pipes.xlk : $(DOG)buildlwo.o $(DOG)pipeobjs.o |
| 46 |
|
| 47 |
@MODULES@@GL@$(DOG)pipes.xlk : %.xlk:%.o |
| 48 |
@MODULES@@GL@ $(RM) $@ |
| 49 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $< |
| 50 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $< |
| 51 |
|
| 52 |
$(DOG)sproingies.xlk : $(SPROINGIESOBJS) |
| 53 |
|
| 54 |
@MODULES@@GL@$(DOG)sproingies.xlk : %.xlk:%.o |
| 55 |
@MODULES@@GL@ $(RM) $@ |
| 56 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(SPROINGIESOBJS) $< |
| 57 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(SPROINGIESOBJS) $< |
| 58 |
|
| 59 |
$(DOG)atlantis.xlk : $(ATLANTISOBJS) |
| 60 |
|
| 61 |
@MODULES@@GL@$(DOG)atlantis.xlk : %.xlk:%.o |
| 62 |
@MODULES@@GL@ $(RM) $@ |
| 63 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(ATLANTISOBJS) $< |
| 64 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(ATLANTISOBJS) $< |
| 65 |
|
| 66 |
$(DOG)bubble3d.xlk : $(BUBBLE3DOBJS) |
| 67 |
|
| 68 |
@MODULES@@GL@$(DOG)bubble3d.xlk : %.xlk:%.o |
| 69 |
@MODULES@@GL@ $(RM) $@ |
| 70 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $< |
| 71 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $< |
| 72 |
|
| 73 |
$(DOG)glplanet.xlk : $(GLPLANETOBJS) |
| 74 |
|
| 75 |
@MODULES@@GL@$(DOG)glplanet.xlk : %.xlk:%.o |
| 76 |
@MODULES@@GL@ $(RM) $@ |
| 77 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(GLPLANETOBJS) $< |
| 78 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(GLPLANETOBJS) $< |
| 79 |
|
| 80 |
$(DOG)molecul.xlk : $(MOLECULEOBJS) |
| 81 |
|
| 82 |
@MODULES@@GL@$(DOG)molecule.xlk : %.xlk:%.o |
| 83 |
@MODULES@@GL@ $(RM) $@ |
| 84 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(MOLECULEOBJS) $< |
| 85 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MOLECULEOBJS) $< |
| 86 |
|
| 87 |
$(DOG)juggler3d.xlk : $(JUGGLER3DOBJS) |
| 88 |
|
| 89 |
@MODULES@@GL@$(DOG)juggler3d.xlk : %.xlk:%.o |
| 90 |
@MODULES@@GL@ $(RM) $@ |
| 91 |
-@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $< |
| 92 |
+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $< |
| 93 |
|
| 94 |
$(DOG)invert.xlk : $(INVERTOBJS) |
| 95 |
|
| 96 |
@MODULES@@CCC@@GL@$(DOG)invert.xlk : %.xlk:%.o |
| 97 |
@MODULES@@CCC@@GL@ $(RM) $@ |
| 98 |
-@MODULES@@CCC@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(INVERTOBJS) $< |
| 99 |
+@MODULES@@CCC@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(INVERTOBJS) $< |
| 100 |
|
| 101 |
xlock : $(UTILOBJDIR)xlock |
| 102 |
|
| 103 |
$(UTILOBJDIR)xlock : $(XLOCKOBJS) |
| 104 |
- $(PURIFY) $(CXX) $(CXXFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS) |
| 105 |
+ $(PURIFY) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS) |
| 106 |
@ $(ECHO) "$@ BUILD COMPLETE" |
| 107 |
@ $(ECHO) "" |
| 108 |
|
| 109 |
@@ -587,10 +588,10 @@ $(GLOBJDIR)tunnel_draw.o : $(GLDIR)tunne |
| 110 |
.SUFFIXES : $(C) $(CX) $(O) $(M) |
| 111 |
|
| 112 |
$(C)$(O) : |
| 113 |
- $(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $< |
| 114 |
+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $< |
| 115 |
|
| 116 |
$(CX)$(O) : |
| 117 |
- $(CXX) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $< |
| 118 |
+ $(CXX) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $< |
| 119 |
|
| 120 |
install : install-program install-man install-ad |
| 121 |
@ $(ECHO) "$@ COMPLETE" |
| 122 |
Index: xlockmore-5.31/xglock/Makefile.in |
| 123 |
=================================================================== |
| 124 |
--- xlockmore-5.31.orig/xglock/Makefile.in |
| 125 |
+++ xlockmore-5.31/xglock/Makefile.in |
| 126 |
@@ -90,6 +90,7 @@ ECHO = echo |
| 127 |
DEFS = @DEFS@ $(DEFINES) -DXGLOCKRC_FILE=\"$(datadir)/xlock/xglockrc\" |
| 128 |
XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_srcdir) |
| 129 |
CFLAGS = @GTK_CFLAGS@ @CFLAGS@ |
| 130 |
+LDFLAGS= @LDFLAGS@ |
| 131 |
#CFLAGS = -O |
| 132 |
#CFLAGS = -g |
| 133 |
XGLOCKLDFLAGS = @XGLOCKLDFLAGS@ |
| 134 |
@@ -101,14 +102,14 @@ XGLOCKLIBS = @XGLOCKLIBS@ |
| 135 |
PURIFY = @PURIFY@ |
| 136 |
|
| 137 |
xglock : $(XGLOCKOBJS) |
| 138 |
- $(PURIFY) $(CC) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS) |
| 139 |
+ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS) |
| 140 |
@ $(ECHO) "$@ BUILD COMPLETE" |
| 141 |
@ $(ECHO) "" |
| 142 |
|
| 143 |
.SUFFIXES : $(C) $(O) |
| 144 |
|
| 145 |
$(C)$(O) : |
| 146 |
- $(CC) -c $(CPPFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $< |
| 147 |
+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $< |
| 148 |
|
| 149 |
install : @INSTALL_XGLOCK@ |
| 150 |
|
| 151 |
Index: xlockmore-5.31/xlock/Makefile.in |
| 152 |
=================================================================== |
| 153 |
--- xlockmore-5.31.orig/xlock/Makefile.in |
| 154 |
+++ xlockmore-5.31/xlock/Makefile.in |
| 155 |
@@ -118,6 +118,7 @@ XLOCKINC = -I. -I.. -I$(top_srcdir) @XLO |
| 156 |
CFLAGS = @CFLAGS@ |
| 157 |
#CFLAGS = -O |
| 158 |
#CFLAGS = -g |
| 159 |
+LDFLAGS = @LDFLAGS@ |
| 160 |
|
| 161 |
#If you have purify, and want to use it, uncomment this definition or |
| 162 |
# run the make as `make PURIFY=purify' |
| 163 |
@@ -127,7 +128,7 @@ PURIFY = @PURIFY@ |
| 164 |
.SUFFIXES : $(C) $(O) |
| 165 |
|
| 166 |
$(C)$(O) : |
| 167 |
- $(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $< |
| 168 |
+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $< |
| 169 |
|
| 170 |
install : |
| 171 |
|
| 172 |
Index: xlockmore-5.31/xmlock/Makefile.in |
| 173 |
=================================================================== |
| 174 |
--- xlockmore-5.31.orig/xmlock/Makefile.in |
| 175 |
+++ xlockmore-5.31/xmlock/Makefile.in |
| 176 |
@@ -92,6 +92,8 @@ ECHO = echo |
| 177 |
DEFS = @DEFS@ $(DEFINES) |
| 178 |
XMLOCKINC = @XMLOCKINC@ -I.. -I$(top_srcdir) |
| 179 |
CFLAGS = @CFLAGS@ |
| 180 |
+LDFLAGS= @LDFLAGS@ |
| 181 |
+ |
| 182 |
#CFLAGS = -O |
| 183 |
#CFLAGS = -g |
| 184 |
XMLOCKLDFLAGS = @XMLOCKLDFLAGS@ |
| 185 |
@@ -103,14 +105,14 @@ XMLOCKLIBS = @XMLOCKLIBS@ |
| 186 |
PURIFY = @PURIFY@ |
| 187 |
|
| 188 |
xmlock : $(XMLOCKOBJS) |
| 189 |
- $(PURIFY) $(CC) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS) |
| 190 |
+ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS) |
| 191 |
@ $(ECHO) "$@ BUILD COMPLETE" |
| 192 |
@ $(ECHO) "" |
| 193 |
|
| 194 |
.SUFFIXES : $(C) $(O) |
| 195 |
|
| 196 |
$(C)$(O) : |
| 197 |
- $(CC) -c $(CPPFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $< |
| 198 |
+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $< |
| 199 |
|
| 200 |
install : @INSTALL_XMLOCK@ |
| 201 |
|
| 202 |
|
| 203 |
|
| 204 |
|
| 205 |
1.1 x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch |
| 206 |
|
| 207 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch?rev=1.1&view=markup |
| 208 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch?rev=1.1&content-type=text/plain |
| 209 |
|
| 210 |
Index: xlockmore-5.31-configure.in.patch |
| 211 |
=================================================================== |
| 212 |
Index: xlockmore-5.31/configure.in |
| 213 |
=================================================================== |
| 214 |
--- xlockmore-5.31.orig/configure.in |
| 215 |
+++ xlockmore-5.31/configure.in |
| 216 |
@@ -8,17 +8,7 @@ AC_CANONICAL_HOST |
| 217 |
canonical=$host |
| 218 |
|
| 219 |
AC_PROG_CC |
| 220 |
-dnl Check if C++ compiler is present. If not set CXX to the C-compiler used |
| 221 |
-dnl for the other compilations. |
| 222 |
-if test "$CC" = gcc; then |
| 223 |
- AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc) |
| 224 |
-else |
| 225 |
- AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc) |
| 226 |
-fi |
| 227 |
AC_PROG_CXX |
| 228 |
-if test "${CXX}" = "xlC" ; then |
| 229 |
- CXXFLAGS="${CXXFLAGS} -+" |
| 230 |
-fi |
| 231 |
|
| 232 |
dnl If you're using g++-2.95 or later and have old X11 includes, you may need |
| 233 |
dnl to use "g++ -fpermissive" in the Makefiles |
Archives