Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/libcap/patches/libcap-1.10-r4-staticfix.diff

    Contents of /trunk/libcap/patches/libcap-1.10-r4-staticfix.diff

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 144 - (show annotations) (download)
    Tue May 8 20:06:05 2007 UTC (17 years ago) by niro
    File size: 2113 byte(s) 
    -import
    1 diff -ur libcap-1.10.orig/libcap/Makefile libcap-1.10/libcap/Makefile
    2 --- libcap-1.10.orig/libcap/Makefile 2004-04-25 12:15:02.000000000 -0700
    3 +++ libcap-1.10/libcap/Makefile 2004-04-25 12:40:47.000000000 -0700
    4 @@ -34,6 +34,7 @@
    5 #
    6 LIBNAME=libcap
    7 PYTHONMODNAME=libcapmodule.so
    8 +STATLIBNAME=$(LIBNAME).a
    9 #
    10
    11 FILES=cap_alloc cap_proc cap_extint cap_flag cap_text cap_sys
    12 @@ -48,9 +49,9 @@
    13 MINLIBNAME=$(MAJLIBNAME).$(MINOR)
    14
    15 ifdef PYTHON
    16 -all: $(MINLIBNAME) $(LIBNAME).a $(PYTHONMODNAME)
    17 +all: $(MINLIBNAME) $(STATLIBNAME) $(PYTHONMODNAME)
    18 else
    19 -all: $(MINLIBNAME) $(LIBNAME).a
    20 +all: $(MINLIBNAME) $(STATLIBNAME)
    21 endif
    22
    23 _makenames: _makenames.c cap_names.sed
    24 @@ -63,8 +64,8 @@
    25 @echo "=> making cap_names.c from <sys/capability.h>"
    26 @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < include/sys/capability.h | fgrep -v 0x > cap_names.sed # @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed
    27
    28 -$(LIBNAME).a: $(OBJS)
    29 - ar cruv $(LIBNAME).a $(OBJS)
    30 +$(STATLIBNAME): $(OBJS)
    31 + ar csruv $(STATLIBNAME) $(OBJS)
    32
    33 $(MINLIBNAME): $(LOBJS)
    34 $(CC) -shared -fPIC -Wl,-soname,$(MAJLIBNAME) -o $@ $(LOBJS)
    35 @@ -88,7 +89,7 @@
    36 mkdir -p -m 0755 $(INCDIR)/sys
    37 install -m 0644 include/sys/capability.h $(INCDIR)/sys
    38 mkdir -p -m 0755 $(LIBDIR)
    39 - install -m 0644 $(LIBNAME).a $(LIBDIR)
    40 + install -m 0644 $(STATLIBNAME) $(LIBDIR)
    41 install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
    42 ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
    43 ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME).so
    44 @@ -100,7 +101,10 @@
    45
    46 clean:
    47 $(LOCALCLEAN)
    48 - rm -f $(OBJS) $(LOBJS) $(LIBNAME).a $(LIBNAME).so*
    49 + rm -f $(OBJS) $(LOBJS) $(STATLIBNAME) $(LIBNAME).so*
    50 rm -f cap_names.h cap_names.sed _makenames libcap_wrap.c
    51 cd include/sys && $(LOCALCLEAN)
    52 +ifdef PYTHON
    53 + rm libcap.py libcap_wrap.o libcapmodule.so
    54 +endif
    55