| 1 |
jlec 10/07/05 16:40:17 |
| 2 |
|
| 3 |
Added: mp-5.1.3-asneeded.patch |
| 4 |
Log: |
| 5 |
Version Bump, respecting CC |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-editors/mp/files/mp-5.1.3-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/files/mp-5.1.3-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/files/mp-5.1.3-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mp-5.1.3-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/config.sh b/config.sh |
| 17 |
index 17ade83..643b07e 100755 |
| 18 |
--- a/config.sh |
| 19 |
+++ b/config.sh |
| 20 |
@@ -80,7 +80,7 @@ echo "Configuring..." |
| 21 |
|
| 22 |
echo "/* automatically created by config.sh - do not modify */" > config.h |
| 23 |
echo "# automatically created by config.sh - do not modify" > makefile.opts |
| 24 |
-> config.ldflags |
| 25 |
+> config.libs |
| 26 |
> config.cflags |
| 27 |
> .config.log |
| 28 |
|
| 29 |
@@ -134,7 +134,7 @@ done |
| 30 |
|
| 31 |
if [ "$MPDM" != "NOTFOUND" ] ; then |
| 32 |
echo "-I$MPDM" >> config.cflags |
| 33 |
- echo "-L$MPDM -lmpdm" >> config.ldflags |
| 34 |
+ echo "-L$MPDM -lmpdm" >> config.libs |
| 35 |
echo "OK ($MPDM)" |
| 36 |
else |
| 37 |
echo "No" |
| 38 |
@@ -146,7 +146,7 @@ if [ ! -f $MPDM/Makefile ] ; then |
| 39 |
( echo ; cd $MPDM ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo ) |
| 40 |
fi |
| 41 |
|
| 42 |
-cat $MPDM/config.ldflags >> config.ldflags |
| 43 |
+cat $MPDM/config.libs >> config.libs |
| 44 |
echo "MPDM=$MPDM" >> makefile.opts |
| 45 |
|
| 46 |
# MPSL |
| 47 |
@@ -160,7 +160,7 @@ done |
| 48 |
|
| 49 |
if [ "$MPSL" != "NOTFOUND" ] ; then |
| 50 |
echo "-I$MPSL" >> config.cflags |
| 51 |
- echo "-L$MPSL -lmpsl" >> config.ldflags |
| 52 |
+ echo "-L$MPSL -lmpsl" >> config.libs |
| 53 |
echo "OK ($MPSL)" |
| 54 |
else |
| 55 |
echo "No" |
| 56 |
@@ -172,7 +172,7 @@ if [ ! -f $MPSL/Makefile ] ; then |
| 57 |
( echo ; cd $MPSL ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo ) |
| 58 |
fi |
| 59 |
|
| 60 |
-cat $MPSL/config.ldflags >> config.ldflags |
| 61 |
+cat $MPSL/config.libs >> config.libs |
| 62 |
echo "MPSL=$MPSL" >> makefile.opts |
| 63 |
|
| 64 |
# Win32 |
| 65 |
@@ -184,7 +184,7 @@ else |
| 66 |
grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null |
| 67 |
|
| 68 |
if [ $? = 0 ] ; then |
| 69 |
- echo "-mwindows -lcomctl32" >> config.ldflags |
| 70 |
+ echo "-mwindows -lcomctl32" >> config.libs |
| 71 |
echo "#define CONFOPT_WIN32 1" >> config.h |
| 72 |
echo "OK" |
| 73 |
DRIVERS="win32 $DRIVERS" |
| 74 |
@@ -279,7 +279,7 @@ else |
| 75 |
|
| 76 |
if [ $? = 0 ] ; then |
| 77 |
echo $TMP_CFLAGS >> config.cflags |
| 78 |
- echo $TMP_LDFLAGS >> config.ldflags |
| 79 |
+ echo $TMP_LDFLAGS >> config.libs |
| 80 |
|
| 81 |
echo "#define CONFOPT_KDE4 1" >> config.h |
| 82 |
echo "OK" |
| 83 |
@@ -357,7 +357,7 @@ else |
| 84 |
if [ $? = 0 ] ; then |
| 85 |
echo "#define CONFOPT_GTK 2" >> config.h |
| 86 |
echo "$TMP_CFLAGS " >> config.cflags |
| 87 |
- echo "$TMP_LDFLAGS " >> config.ldflags |
| 88 |
+ echo "$TMP_LDFLAGS " >> config.libs |
| 89 |
echo "OK (2.0)" |
| 90 |
DRIVERS="gtk $DRIVERS" |
| 91 |
DRV_OBJS="mpv_gtk.o $DRV_OBJS" |
| 92 |
diff --git a/makefile.in b/makefile.in |
| 93 |
index 704eb57..5714f62 100644 |
| 94 |
--- a/makefile.in |
| 95 |
+++ b/makefile.in |
| 96 |
@@ -36,7 +36,7 @@ dep: |
| 97 |
gcc -MM *.c `cat config.cflags` > makefile.depend |
| 98 |
|
| 99 |
$(APPNAME): $(OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a |
| 100 |
- $(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` -o $@ |
| 101 |
+ $(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` `cat config.libs` -o $@ |
| 102 |
|
| 103 |
mpv_kde4.o: mpv_kde4.cpp mpv_kde4.moc |
| 104 |
$(CPP) $(CFLAGS) -I. `cat config.cflags` -c $< |
| 105 |
@@ -54,7 +54,7 @@ mp_res.o: mp_res.rc |
| 106 |
$(WINDRES) mp_res.rc mp_res.o |
| 107 |
|
| 108 |
mp-5.exe: $(OBJS) mp_res.o $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a |
| 109 |
- $(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` -o $@ |
| 110 |
+ $(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` `cat config.libs` -o $@ |
| 111 |
|
| 112 |
clean: |
| 113 |
rm -f $(APPNAME) $(LIB) $(OBJS) *.o *.moc tags *.tar.gz *.exe *.zip .installer.c *.1 |
| 114 |
@@ -62,7 +62,7 @@ clean: |
| 115 |
(cd $(MPSL) ; make clean) |
| 116 |
|
| 117 |
distclean: clean |
| 118 |
- rm -f config.h config.cflags config.ldflags \ |
| 119 |
+ rm -f config.h config.cflags config.ldflags config.libs \ |
| 120 |
makefile.opts Makefile po/minimum-profit.pot |
| 121 |
|
| 122 |
docsclean: |
| 123 |
diff --git a/mpdm/config.sh b/mpdm/config.sh |
| 124 |
index 9e4f2f8..16033d3 100755 |
| 125 |
--- a/mpdm/config.sh |
| 126 |
+++ b/mpdm/config.sh |
| 127 |
@@ -70,7 +70,7 @@ echo "Configuring MPDM..." |
| 128 |
|
| 129 |
echo "/* automatically created by config.sh - do not modify */" > config.h |
| 130 |
echo "# automatically created by config.sh - do not modify" > makefile.opts |
| 131 |
-> config.ldflags |
| 132 |
+> config.libs |
| 133 |
> config.cflags |
| 134 |
> .config.log |
| 135 |
|
| 136 |
@@ -169,7 +169,7 @@ if [ "$WITH_PCRE" = 1 ] ; then |
| 137 |
echo "OK (using pcre library)" |
| 138 |
echo "#define CONFOPT_PCRE 1" >> config.h |
| 139 |
echo "$TMP_CFLAGS " >> config.cflags |
| 140 |
- echo "$TMP_LDFLAGS " >> config.ldflags |
| 141 |
+ echo "$TMP_LDFLAGS " >> config.libs |
| 142 |
REGEX_YET=1 |
| 143 |
fi |
| 144 |
fi |
| 145 |
@@ -316,7 +316,7 @@ else |
| 146 |
if [ $? = 0 ] ; then |
| 147 |
echo "OK (libintl needed)" |
| 148 |
echo "#define CONFOPT_GETTEXT 1" >> config.h |
| 149 |
- echo "$TMP_LDFLAGS" >> config.ldflags |
| 150 |
+ echo "$TMP_LDFLAGS" >> config.libs |
| 151 |
else |
| 152 |
echo "No" |
| 153 |
fi |
| 154 |
@@ -349,7 +349,7 @@ else |
| 155 |
if [ $? = 0 ] ; then |
| 156 |
echo "OK (libiconv needed)" |
| 157 |
echo "#define CONFOPT_ICONV 1" >> config.h |
| 158 |
- echo "$TMP_LDFLAGS" >> config.ldflags |
| 159 |
+ echo "$TMP_LDFLAGS" >> config.libs |
| 160 |
else |
| 161 |
echo "No" |
| 162 |
fi |
| 163 |
diff --git a/mpdm/makefile.in b/mpdm/makefile.in |
| 164 |
index 17ee1a0..10c102d 100644 |
| 165 |
--- a/mpdm/makefile.in |
| 166 |
+++ b/mpdm/makefile.in |
| 167 |
@@ -32,7 +32,7 @@ $(LIB): $(OBJS) |
| 168 |
$(AR) rv $(LIB) $(OBJS) |
| 169 |
|
| 170 |
stress: stress.c $(LIB) |
| 171 |
- $(CC) $(CFLAGS) `cat config.ldflags` stress.c -L. -lmpdm -o $@ |
| 172 |
+ $(CC) $(CFLAGS) `cat config.ldflags` `cat config.libs` stress.c -L. -lmpdm -o $@ |
| 173 |
|
| 174 |
.SUFFIXES: .txt .html |
| 175 |
|
| 176 |
@@ -54,7 +54,7 @@ clean: |
| 177 |
rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress |
| 178 |
|
| 179 |
distclean: clean |
| 180 |
- rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile |
| 181 |
+ rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile |
| 182 |
|
| 183 |
realclean: distclean docsclean |
| 184 |
|
| 185 |
diff --git a/mpsl/config.sh b/mpsl/config.sh |
| 186 |
index d325412..4f36b06 100755 |
| 187 |
--- a/mpsl/config.sh |
| 188 |
+++ b/mpsl/config.sh |
| 189 |
@@ -69,7 +69,7 @@ echo "Configuring MPSL..." |
| 190 |
|
| 191 |
echo "/* automatically created by config.sh - do not modify */" > config.h |
| 192 |
echo "# automatically created by config.sh - do not modify" > makefile.opts |
| 193 |
-> config.ldflags |
| 194 |
+> config.libs |
| 195 |
> config.cflags |
| 196 |
> .config.log |
| 197 |
|
| 198 |
@@ -131,7 +131,7 @@ done |
| 199 |
|
| 200 |
if [ "$MPDM" != "NOTFOUND" ] ; then |
| 201 |
echo "-I$MPDM" >> config.cflags |
| 202 |
- echo "-L$MPDM -lmpdm" >> config.ldflags |
| 203 |
+ echo "-L$MPDM -lmpdm" >> config.libs |
| 204 |
echo "OK ($MPDM)" |
| 205 |
else |
| 206 |
echo "No" |
| 207 |
@@ -143,7 +143,7 @@ if [ ! -f $MPDM/Makefile ] ; then |
| 208 |
( echo ; cd $MPDM ; ./config.sh $CONF_ARGS ; echo ) |
| 209 |
fi |
| 210 |
|
| 211 |
-cat $MPDM/config.ldflags >> config.ldflags |
| 212 |
+cat $MPDM/config.libs >> config.libs |
| 213 |
|
| 214 |
# if win32, the interpreter is called mpsl.exe |
| 215 |
grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null && TARGET=mpsl.exe |
| 216 |
diff --git a/mpsl/makefile.in b/mpsl/makefile.in |
| 217 |
index 14ed62d..253e278 100644 |
| 218 |
--- a/mpsl/makefile.in |
| 219 |
+++ b/mpsl/makefile.in |
| 220 |
@@ -49,11 +49,11 @@ $(LIB): $(OBJS) |
| 221 |
$(AR) rv $(LIB) $(OBJS) |
| 222 |
|
| 223 |
$(TARGET): $(LIB) $(MPDM)/libmpdm.a |
| 224 |
- $(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` -o $@ |
| 225 |
+ $(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@ |
| 226 |
|
| 227 |
stress: stress.c $(LIB) $(MPDM)/libmpdm.a |
| 228 |
$(CC) $(CFLAGS) `cat config.cflags` stress.c \ |
| 229 |
- -L. -lmpsl `cat config.ldflags` -o $@ |
| 230 |
+ -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@ |
| 231 |
|
| 232 |
clean: |
| 233 |
rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress |
| 234 |
@@ -62,7 +62,7 @@ realclean: clean |
| 235 |
rm -f y.tab.c y.tab.h lex.yy.c |
| 236 |
|
| 237 |
distclean: clean y.tab.c y.tab.h lex.yy.c |
| 238 |
- rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile |
| 239 |
+ rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile |
| 240 |
|
| 241 |
realclean: distclean docsclean |
Archives