Author: sparky Date: Wed Aug 2 02:49:03 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - LIBDIR: install-time lib directory - LDFLAGS: use ldflags while linking
---- Files affected: SOURCES: zaptel-LIBDIR.patch (NONE -> 1.1) (NEW), zaptel-LDFLAGS.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/zaptel-LIBDIR.patch diff -u /dev/null SOURCES/zaptel-LIBDIR.patch:1.1 --- /dev/null Wed Aug 2 04:49:03 2006 +++ SOURCES/zaptel-LIBDIR.patch Wed Aug 2 04:48:58 2006 @@ -0,0 +1,23 @@ +diff -Nur zaptel-1.2.6/Makefile zaptel-1.2.6.LIBDIR/Makefile +--- zaptel-1.2.6/Makefile 2006-08-02 04:46:13.000000000 +0200 ++++ zaptel-1.2.6.LIBDIR/Makefile 2006-08-02 04:46:13.000000000 +0200 +@@ -308,14 +308,14 @@ + install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \ + fi + if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi +- install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) ++ install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) + [ `id -u` = 0 ] && /sbin/ldconfig || : +- rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO) ++ rm -f $(INSTALL_PREFIX)$(LIBDIR)/$(LIBTONEZONE_SO) + ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ +- $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) ++ $(INSTALL_PREFIX)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) + ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ +- $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO) +- if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi ++ $(INSTALL_PREFIX)$(LIBDIR)/$(LIBTONEZONE_SO) ++ if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)$(LIBDIR)/$(LIBTONEZONE_SO); fi + install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h + install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h + install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h ================================================================ Index: SOURCES/zaptel-LDFLAGS.patch diff -u /dev/null SOURCES/zaptel-LDFLAGS.patch:1.1 --- /dev/null Wed Aug 2 04:49:03 2006 +++ SOURCES/zaptel-LDFLAGS.patch Wed Aug 2 04:48:58 2006 @@ -0,0 +1,102 @@ +diff -Nur zaptel-1.2.6/Makefile zaptel-1.2.6.LDFLAGS/Makefile +--- zaptel-1.2.6/Makefile 2006-08-02 04:47:06.000000000 +0200 ++++ zaptel-1.2.6.LDFLAGS/Makefile 2006-08-02 04:47:07.000000000 +0200 +@@ -176,7 +176,7 @@ + tor2ee.o: tor2-hw.h + + tor2ee: tor2ee.o +- $(CC) $(CFLAGS) -o $@ $^ -lpci ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -lpci + + zonedata.lo: zonedata.c + $(CC) -c $(LCFLAGS) -o $@ $^ +@@ -185,7 +185,7 @@ + $(CC) -c $(LCFLAGS) -o $@ $^ + + torisatool: torisatool.o +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + tones.h: gendigits + ./gendigits > $@ +@@ -197,7 +197,7 @@ + ./makefw pciradio.rbt radfw > radfw.h + + gendigits: gendigits.o +- $(CC) -o $@ $^ -lm ++ $(CC) $(LDFLAGS) -o $@ $^ -lm + + zaptel.c: tones.h + +@@ -213,16 +213,16 @@ + $(CC) -o $@ -c $^ + + zttool: zttool.o +- $(CC) -o $@ $^ -lnewt ++ $(CC) $(LDFLAGS) -o $@ $^ -lnewt + + ztmonitor: ztmonitor.o +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + ztspeed: ztspeed.o +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + sethdlc-new: sethdlc-new.o +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + sethdlc-new.o: sethdlc-new.c + $(CC) -o $@ -c $(CFLAGS) -I$(KINCLUDES) $^ +@@ -231,18 +231,18 @@ + ar rcs libtonezone.a $^ + + $(LIBTONEZONE_SO): $(TZOBJS) +- $(CC) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -lm -o $@ $^ ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -lm -o $@ $^ + + ztcfg.c: ztcfg.h + + ztcfg-shared: ztcfg.o $(LIBTONEZONE_SO) +- $(CC) -o $@ $^ -lm ++ $(CC) $(LDFLAGS) -o $@ $^ -lm + + ztcfg: ztcfg.o libtonezone.a +- $(CC) -o $@ $^ -lm ++ $(CC) $(LDFLAGS) -o $@ $^ -lm + + ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LIBTONEZONE_SO) +- $(CC) -o $@ $^ -lm ++ $(CC) $(LDFLAGS) -o $@ $^ -lm + + mknotch.o: mknotch.cc + $(CC) -o $@ -c $^ +@@ -254,22 +254,22 @@ + $(CC) -o $@ -g -c $^ + + usbfxstest: usbfxstest.o +- $(CC) -o $@ $^ -lzap ++ $(CC) $(LDFLAGS) -o $@ $^ -lzap + + fxstest: fxstest.o $(LIBTONEZONE_SO) +- $(CC) -o $@ $^ -lm ++ $(CC) $(LDFLAGS) -o $@ $^ -lm + + fxotune: fxotune.o +- $(CC) -o $@ $^ -lm ++ $(CC) $(LDFLAGS) -o $@ $^ -lm + + fxsdump: fxsdump.o +- $(CC) -o $@ $^ -lm ++ $(CC) $(LDFLAGS) -o $@ $^ -lm + + stackcheck: checkstack $(BUILDVER) + ./checkstack *.o + + ztdiag: ztdiag.o +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + devices: + ifndef DYNFS ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
