On Wednesday 18 July 2007, Rafael J. Wysocki wrote:
> AFAICS, recent versions of pciutils depend on it.
Oh...
You don't have to compile it with zlib...
"""The configure script will automatically enable support for a compressed
pci.ids if you have zlib installed. You can override its guess by using
"make ZLIB=no" or "make ZLIB=yes". If compressed support is enabled,
pciutils will use pci.ids.gz in preference to pci.ids, even if the
pci.ids file is newer. If the pci.ids.gz file is missing, it will use
pci.ids instead."""
Please consider the following patch.
Best Regards,
Alon Bar-Lev
---
diff -urNp suspend.org/Makefile suspend/Makefile
--- suspend.org/Makefile 2007-05-15 22:32:48.000000000 +0300
+++ suspend/Makefile 2007-07-19 06:03:54.000000000 +0300
@@ -27,9 +27,12 @@ BINARIES=s2disk s2both s2ram swap-offset
S2RAM_LD_FLAGS = $(LD_FLAGS)
SWSUSP_LD_FLAGS = $(LD_FLAGS)
ifeq ($(ARCH), x86)
+PCI_CC_FLAGS = $(shell pkg-config --cflags libpci)
+PCI_LD_FLAGS = $(shell pkg-config --libs libpci)
S2RAM_OBJ += s2ram-x86.o dmidecode.o radeontool.o vbetool/vbetool.o
-S2RAM_LD_FLAGS += -lx86 -lpci -lz
+S2RAM_CC_FLAGS += $(PCI_CC_FLAGS)
+S2RAM_LD_FLAGS += -lx86 $(PCI_LD_FLAGS)
else ifeq ($(ARCH), ppc)
S2RAM_OBJ += s2ram-ppc.o
endif
@@ -105,10 +116,10 @@ s2disk: $(SWSUSP_OBJ) suspend.c
$(CC) -g $(CC_FLAGS) $^ -o $@ $(SWSUSP_LD_FLAGS)
s2ram: $(S2RAM_OBJ) s2ram.c
- $(CC) -g $(CC_FLAGS) -include s2ram-$(ARCH).h $^ -o $@ $(S2RAM_LD_FLAGS)
+ $(CC) -g $(CC_FLAGS) $(S2RAM_CC_FLAGS) -include s2ram-$(ARCH).h $^ -o
$@ $(S2RAM_LD_FLAGS)
s2both: $(SWSUSP_OBJ) $(S2RAM_OBJ) s2ram-both.o suspend.c
- $(CC) -g $(CC_FLAGS) -include s2ram-$(ARCH).h -DCONFIG_BOTH $^ -o $@
$(SWSUSP_LD_FLAGS) $(S2RAM_LD_FLAGS)
+ $(CC) -g $(CC_FLAGS) $(S2RAM_CC_FLAGS) -include s2ram-$(ARCH).h
-DCONFIG_BOTH $^ -o $@ $(SWSUSP_LD_FLAGS) $(S2RAM_LD_FLAGS)
resume: resume.c $(SWSUSP_OBJ)
$(CC) $(CC_FLAGS) $(STATIC_CC_FLAGS) $^ -o $@ $(SWSUSP_LD_FLAGS)
$(STATIC_LD_FLAGS)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Suspend-devel mailing list
Suspend-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/suspend-devel
