Commit 3a4ee9dd authored by Per Olofsson's avatar Per Olofsson

Actually remove unnecessary-linkage.patch, not only from series.

parent 12dcdd6a
......@@ -3,6 +3,7 @@ pcmciautils (018-2) UNRELEASED; urgency=low
* Remove module-init-tools and lsb-base from Depends, since the init
script is now gone.
* Rename debian/pcmciautils.docs to debian/docs.
* Actually remove unnecessary-linkage.patch, not only from series.
-- Per Olofsson <pelle@debian.org> Mon, 25 Apr 2011 22:43:49 +0200
......
Description: Don't link pcmcia-check-broken-cis against libsysfs
Author: Colin Watson <cjwatson@debian.org>
Forwarded: http://lists.infradead.org/pipermail/linux-pcmcia/2010-March/007198.html
Last-Update: 2010-03-29
--- a/Makefile
+++ b/Makefile
@@ -157,10 +157,12 @@ CFLAGS += -I$(PWD)/src
CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
LIB_OBJS = -lc -lsysfs
+LIB_PLAIN_OBJS = -lc
LIB_PCI_OBJS = -lc -lpci
ifeq ($(strip $(STATIC)),true)
LIB_OBJS = -lsysfs
+ LIB_PLAIN_OBJS =
LIB_PCI_OBJS = -lpci
LDFLAGS += -static
else
@@ -237,7 +239,7 @@ $(PCCARDCTL): $(LIBC) src/$(PCCARDCTL).o
$(QUIET) $(STRIPCMD) $@
$(PCMCIA_CHECK_BROKEN_CIS): $(LIBC) src/$(PCMCIA_CHECK_BROKEN_CIS).o src/read-cis.o $(OBJS) $(HEADERS)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/$(PCMCIA_CHECK_BROKEN_CIS).o src/read-cis.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/$(PCMCIA_CHECK_BROKEN_CIS).o src/read-cis.o $(LIB_PLAIN_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config.o $(OBJS) $(HEADERS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment