diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-08-29 14:53:12 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-08-29 14:53:12 +0000 |
| commit | f0258d6553a3037824f538c997f964987c10c337 (patch) | |
| tree | 1f8ad84407773eeda2d3c338adeb8754aeb179e1 | |
| parent | 9bee75bc8abbefd1319a7079c03e08ff11fa4849 (diff) | |
| download | initscripts-f0258d6553a3037824f538c997f964987c10c337.tar initscripts-f0258d6553a3037824f538c997f964987c10c337.tar.gz initscripts-f0258d6553a3037824f538c997f964987c10c337.tar.bz2 initscripts-f0258d6553a3037824f538c997f964987c10c337.tar.xz initscripts-f0258d6553a3037824f538c997f964987c10c337.zip | |
require popt in /lib*, link it dynamically
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rw-r--r-- | src/Makefile | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec index 85b37c9e..19bad442 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -17,6 +17,7 @@ Requires: /sbin/ip, /sbin/arping, net-tools Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 078-1 +Requires: popt >= 1.12-2 Conflicts: mkinitrd < 4.0, kernel < 2.6.12 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 diff --git a/src/Makefile b/src/Makefile index 5a6e171f..df4f6bd4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -48,16 +48,16 @@ install-test: install -m 755 testdinit $(ROOT)/etc/init.d/testd getkey: getkey.o - $(CC) $(LDFLAGS) -o $@ $< -Wl,-Bstatic -lpopt -Wl,-Bdynamic + $(CC) $(LDFLAGS) -o $@ $< -lpopt ipcalc: ipcalc.o - $(CC) $(LDFLAGS) -o $@ $< -Wl,-Bstatic -lpopt -Wl,-Bdynamic + $(CC) $(LDFLAGS) -o $@ $< -lpopt initlog: $(INITLOG_OBJS) - $(CC) $(LDFLAGS) -o $@ $(INITLOG_OBJS) -Wl,-Bstatic -lpopt -Wl,-Bdynamic + $(CC) $(LDFLAGS) -o $@ $(INITLOG_OBJS) -lpopt usleep: $(USLEEP_OBJS) - $(CC) $(LDFLAGS) -o $@ $(USLEEP_OBJS) -Wl,-Bstatic -lpopt -Wl,-Bdynamic + $(CC) $(LDFLAGS) -o $@ $(USLEEP_OBJS) -lpopt ppp-watch: $(PPPWATCH_OBJS) $(CC) $(LDFLAGS) -o $@ $(PPPWATCH_OBJS) `pkg-config glib-2.0 --libs` @@ -78,4 +78,4 @@ rename_device: rename_device.c $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -o $@ $< `pkg-config glib-2.0 --libs` kmodule: kmodule.o - $(CC) $(LDFLAGS) -o $@ $< -Wl,-Bstatic -lpopt -Wl,-Bdynamic -lkudzu -lpci + $(CC) $(LDFLAGS) -o $@ $< -lpopt -lkudzu -lpci |