You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
83 lines
2.5 KiB
83 lines
2.5 KiB
Index: lib/Makefile.inc.in |
|
--- lib/Makefile.inc.in.orig 2006-02-20 23:44:09 +0100 |
|
+++ lib/Makefile.inc.in 2006-03-05 09:55:05 +0100 |
|
@@ -24,30 +24,12 @@ |
|
# Libraries. librxar is created such that it's possible to run xar without |
|
# first installing libxar. |
|
|
|
-ifeq (elf, @abi@) |
|
-LIBRXAR_SNAME := librxar.so.@LIB_REV@ |
|
-LIBRXAR_LNAME := librxar.so |
|
+LIBRXAR_SNAME := librxar.a |
|
+LIBRXAR_LNAME := librxar.a.1 |
|
LIBRXAR_L := @objroot@lib/$(LIBRXAR_LNAME) |
|
-LIBXAR_SNAME := libxar.so.@LIB_REV@ |
|
-LIBXAR_LNAME := libxar.so |
|
+LIBXAR_SNAME := libxar.a |
|
+LIBXAR_LNAME := libxar.a.1 |
|
LIBXAR_L := @objroot@lib/$(LIBXAR_LNAME) |
|
-endif |
|
-ifeq (macho, @abi@) |
|
-LIBRXAR_SNAME := librxar.@LIB_REV@.dylib |
|
-LIBRXAR_LNAME := librxar.dylib |
|
-LIBRXAR_L := @objroot@lib/$(LIBRXAR_LNAME) |
|
-LIBXAR_SNAME := libxar.@LIB_REV@.dylib |
|
-LIBXAR_LNAME := libxar.dylib |
|
-LIBXAR_L := @objroot@lib/$(LIBXAR_LNAME) |
|
-endif |
|
-ifeq (aout, @abi@) |
|
-LIBRXAR_SNAME := librxar.so.@LIB_REV@.0 |
|
-LIBRXAR_LNAME := |
|
-LIBRXAR_L := |
|
-LIBXAR_SNAME := libxar.so.@LIB_REV@.0 |
|
-LIBXAR_LNAME := |
|
-LIBXAR_L := |
|
-endif |
|
LIBRXAR_S := @objroot@lib/$(LIBRXAR_SNAME) |
|
LIBXAR_S := @objroot@lib/$(LIBXAR_SNAME) |
|
|
|
@@ -104,15 +86,7 @@ |
|
# installing libxar. |
|
$(LIBRXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o) |
|
@mkdir -p $(@D) |
|
-ifeq (elf, @abi@) |
|
- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ |
|
-endif |
|
-ifeq (macho, @abi@) |
|
- $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name @abs_objroot@$(LIBRXAR_S) -o $@ $+ $(LDFLAGS) @LIBS@ |
|
-endif |
|
-ifeq (aout, @abi@) |
|
- $(CC) -shared -o $@ $+ |
|
-endif |
|
+ ar cvr $@ $+ |
|
ifneq ($(words "" $(LIBRXAR_L)), 1) |
|
rm -f $(LIBRXAR_L) |
|
ln -s $(LIBRXAR_SNAME) $(LIBRXAR_L) |
|
@@ -120,15 +94,7 @@ |
|
|
|
$(LIBXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o) |
|
@mkdir -p $(@D) |
|
-ifeq (elf, @abi@) |
|
- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ |
|
-endif |
|
-ifeq (macho, @abi@) |
|
- $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ |
|
-endif |
|
-ifeq (aout, @abi@) |
|
- $(CC) -shared -o $@ $+ |
|
-endif |
|
+ ar cvr $@ $+ |
|
ifneq ($(words "" $(LIBXAR_L)), 1) |
|
rm -f $(LIBXAR_L) |
|
ln -s $(LIBXAR_SNAME) $(LIBXAR_L) |
|
Index: lib/archive.c |
|
--- lib/archive.c.orig 2006-02-20 23:44:09 +0100 |
|
+++ lib/archive.c 2006-03-05 09:52:26 +0100 |
|
@@ -39,6 +39,7 @@ |
|
#include <fcntl.h> |
|
#include <libgen.h> |
|
#include <errno.h> |
|
+#include <limits.h> |
|
#include <sys/stat.h> |
|
#include <arpa/inet.h> /* for ntoh{l,s} */ |
|
#include <inttypes.h> /* for PRIu64 */
|
|
|