Attachment 5469 Details for Bug 13039 – file.diff

[patch] file.diff

file.diff (text/plain), 1.08 KB, created by mikko on 1999-08-09 09:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mikko

Created: 1999-08-09 09:20:00 UTC

Size: 1.08 KB

patch

obsolete

>diff -ru /usr/src/usr.bin/make/arch.c /tmp/make/arch.c
>--- /usr/src/usr.bin/make/arch.c	Thu Oct 29 19:17:44 1998
>+++ /tmp/make/arch.c	Mon Aug  9 09:53:40 1999
>@@ -118,7 +118,7 @@
> static void ArchFree __P((ClientData));
> static struct ar_hdr *ArchStatMember __P((char *, char *, Boolean));
> static FILE *ArchFindMember __P((char *, char *, struct ar_hdr *, char *));
>-#if defined(__svr4__) || defined(__SVR4)
>+#if defined(__svr4__) || defined(__SVR4) || defined(__ELF__)
> #define SVR4ARCHIVES
> static int ArchSVR4Entry __P((Arch *, char *, size_t, FILE *));
> #endif
>@@ -474,7 +474,7 @@
>      * the comparisons easier...
>      */
>     cp = strrchr (member, '/');
>-    if (cp != (char *) NULL) {
>+    if (cp != (char *) NULL && strcmp(member, RANLIBMAG) != 0) {
> 	member = cp + 1;
>     }
> 
>diff -ru /usr/src/usr.bin/make/config.h /tmp/make/config.h
>--- /usr/src/usr.bin/make/config.h	Thu Oct 29 19:17:45 1998
>+++ /tmp/make/config.h	Mon Aug  9 09:53:06 1999
>@@ -114,4 +114,8 @@
> # ifndef RANLIBMAG
> #  define RANLIBMAG "__.SYMDEF"
> # endif
>+#else
>+# ifndef RANLIBMAG
>+#  define RANLIBMAG "/"
>+# endif
> #endif

Actions: View | Diff

Attachments on bug 13039: 5469