| 1 |
rajiv 08/08/24 19:30:06 |
| 2 |
|
| 3 |
Added: zaptel-1.2.26-gentoo.diff |
| 4 |
Log: |
| 5 |
fix for multilib, bug #208190. thanks to gentoofan23 for the patch. |
| 6 |
(Portage version: 2.1.5.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-misc/zaptel/files/zaptel-1.2.26-gentoo.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/files/zaptel-1.2.26-gentoo.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/files/zaptel-1.2.26-gentoo.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: zaptel-1.2.26-gentoo.diff |
| 15 |
=================================================================== |
| 16 |
diff -uNr zaptel-1.2.26/build_tools/genmodconf zaptel-1.2.26-gentoo/build_tools/genmodconf |
| 17 |
--- zaptel-1.2.26/build_tools/genmodconf 2007-07-11 14:58:09.000000000 -0400 |
| 18 |
+++ zaptel-1.2.26-gentoo/build_tools/genmodconf 2008-08-24 14:24:16.000000000 -0400 |
| 19 |
@@ -79,20 +79,6 @@ |
| 20 |
|
| 21 |
echo Building ${target}... |
| 22 |
|
| 23 |
-if [ "${1}" = "linux24" ]; then |
| 24 |
- for mod in ${3}; do |
| 25 |
- if ! grep -q "post-install ${mod} " ${target}; then |
| 26 |
- echo "post-install ${mod} /sbin/ztcfg" >> ${target} |
| 27 |
- fi |
| 28 |
- done |
| 29 |
-elif [ "${1}" = "linux26" ]; then |
| 30 |
- for mod in ${3}; do |
| 31 |
- if ! grep -q "install ${mod} " ${target}; then |
| 32 |
- echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target} |
| 33 |
- fi |
| 34 |
- done |
| 35 |
-fi |
| 36 |
- |
| 37 |
if [ -z "${combined}" ]; then |
| 38 |
echo "***" |
| 39 |
echo "*** WARNING:" |
| 40 |
diff -uNr zaptel-1.2.26/Makefile zaptel-1.2.26-gentoo/Makefile |
| 41 |
--- zaptel-1.2.26/Makefile 2008-03-31 20:08:21.000000000 -0400 |
| 42 |
+++ zaptel-1.2.26-gentoo/Makefile 2008-08-24 14:27:44.000000000 -0400 |
| 43 |
@@ -121,7 +121,7 @@ |
| 44 |
|
| 45 |
INSTALL_PREFIX := /usr |
| 46 |
|
| 47 |
-CFLAGS+=-I. -O4 -g -fPIC -Wall |
| 48 |
+CFLAGS+=-I. -g -Wall |
| 49 |
ifneq (,$(findstring ppc,$(MACHINE))) |
| 50 |
CFLAGS += -fsigned-char |
| 51 |
KFLAGS += -msoft-float -fsigned-char |
| 52 |
@@ -209,7 +209,7 @@ |
| 53 |
LIBTONEZONE_SO_MAJOR_VER:=1 |
| 54 |
LIBTONEZONE_SO_MINOR_VER:=0 |
| 55 |
|
| 56 |
-LIBDIR := $(INSTALL_PREFIX)/lib |
| 57 |
+LIBDIR := $(INSTALL_PREFIX)/$(MYLIBDIR) |
| 58 |
INCLUDE_DIR := $(INSTALL_PREFIX)/include |
| 59 |
# Note: Zaptel's use of /sbin is slightly non-standard: |
| 60 |
SBINDIR := /sbin |
| 61 |
@@ -302,7 +302,7 @@ |
| 62 |
$(CC) $(KFLAGS) -o $@ -c $< |
| 63 |
|
| 64 |
zonedata.lo tonezone.lo: %.lo: %.c |
| 65 |
- $(CC) -c $(CFLAGS) -o $@ $^ |
| 66 |
+ $(CC) -c $(CFLAGS) -fPIC -o $@ $^ |
| 67 |
|
| 68 |
tones.h: gendigits |
| 69 |
./gendigits > $@ |
| 70 |
@@ -412,7 +412,7 @@ |
| 71 |
else # DYNFS |
| 72 |
ifdef UDEVRULES |
| 73 |
install -d $(DESTDIR)/etc/udev/rules.d |
| 74 |
- build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules |
| 75 |
+ build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules |
| 76 |
else # !UDEVRULES |
| 77 |
@echo "**** Dynamic filesystem detected -- not creating device nodes" |
| 78 |
endif |
| 79 |
@@ -481,11 +481,10 @@ |
| 80 |
rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o |
| 81 |
endif |
| 82 |
rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o |
| 83 |
- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : |
| 84 |
|
| 85 |
install-libs: libs |
| 86 |
install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) |
| 87 |
- [ `id -u` = 0 ] && /sbin/ldconfig || : |
| 88 |
+ [ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)$(LIBDIR) || : |
| 89 |
rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO) |
| 90 |
ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ |
| 91 |
$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) |
Archives