| 1 |
ulm 12/10/01 19:48:13 |
| 2 |
|
| 3 |
Added: 07_all_ar.patch |
| 4 |
Log: |
| 5 |
Get AR and ARFLAGS from configure, bug 436758. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1 src/patchsets/emacs/24.2/07_all_ar.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/24.2/07_all_ar.patch?rev=1.1&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/24.2/07_all_ar.patch?rev=1.1&content-type=text/plain |
| 12 |
|
| 13 |
Index: 07_all_ar.patch |
| 14 |
=================================================================== |
| 15 |
Get AR and ARFLAGS from configure. |
| 16 |
https://bugs.gentoo.org/436758 |
| 17 |
http://debbugs.gnu.org/12549 |
| 18 |
|
| 19 |
--- emacs-24.2-orig/lwlib/Makefile.in |
| 20 |
+++ emacs-24.2/lwlib/Makefile.in |
| 21 |
@@ -37,7 +37,8 @@ |
| 22 |
CPPFLAGS=@CPPFLAGS@ |
| 23 |
RANLIB=@RANLIB@ |
| 24 |
|
| 25 |
-AR = ar cq |
| 26 |
+AR = @AR@ |
| 27 |
+ARFLAGS = @ARFLAGS@ |
| 28 |
|
| 29 |
LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o |
| 30 |
MOTIF_OBJS = lwlib-Xm.o |
| 31 |
@@ -65,7 +66,7 @@ |
| 32 |
|
| 33 |
liblw.a: $(OBJS) |
| 34 |
rm -f $@ |
| 35 |
- $(AR) $@ $(OBJS) |
| 36 |
+ $(AR) $(ARFLAGS) $@ $(OBJS) |
| 37 |
$(RANLIB) $@ |
| 38 |
|
| 39 |
## Generated files in ../src, non-generated in $(srcdir)/../src. |
| 40 |
--- emacs-24.2-orig/oldXMenu/Makefile.in |
| 41 |
+++ emacs-24.2/oldXMenu/Makefile.in |
| 42 |
@@ -57,8 +57,8 @@ |
| 43 |
TAGS = etags |
| 44 |
RM = rm -f |
| 45 |
RANLIB = @RANLIB@ |
| 46 |
-# Solaris 2.1 ar doesn't accept the 'l' option. |
| 47 |
-AR = ar cq |
| 48 |
+AR = @AR@ |
| 49 |
+ARFLAGS = @ARFLAGS@ |
| 50 |
|
| 51 |
OBJS = Activate.o \ |
| 52 |
AddPane.o \ |
| 53 |
@@ -98,7 +98,7 @@ |
| 54 |
|
| 55 |
libXMenu11.a: $(OBJS) $(EXTRA) |
| 56 |
$(RM) $@ |
| 57 |
- $(AR) $@ $(OBJS) $(EXTRA) |
| 58 |
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) |
| 59 |
$(RANLIB) $@ |
| 60 |
|
| 61 |
Activate.o: Activate.c XMenuInt.h XMenu.h X10.h |
Archives