[coreboot] flashrom Makefile improvements
Carl-Daniel Hailfinger
c-d.hailfinger.devel.2006 at gmx.net
Thu May 14 15:36:43 CEST 2009
Before I apply this patch, I'd like to see a test on a non-Linux OS.
On 12.05.2009 19:17, Christian Ruppert wrote:
> Signed-off-by: Christian Ruppert <spooky85 at gmail.com>
>
> Index: Makefile
> ===================================================================
> --- Makefile (revision 483)
> +++ Makefile (working copy)
> @@ -8,12 +8,14 @@
>
> CC ?= gcc
> STRIP = strip
> -INSTALL = /usr/bin/install
> -PREFIX = /usr/local
> -#CFLAGS = -O2 -g -Wall -Werror
> -CFLAGS = -Os -Wall -Werror
> -LDFLAGS =
> +INSTALL = install
> +PREFIX ?= /usr/local
> +CFLAGS ?= -Os -Wall -Werror
>
> +prefix = $(DESTDIR)$(PREFIX)
> +man8dir = $(prefix)/share/man/man8
> +sbindir = $(prefix)/sbin
> +
> OS_ARCH = $(shell uname)
> ifneq ($(OS_ARCH), SunOS)
> STRIP_ARGS = -s
> @@ -27,7 +29,7 @@
> LDFLAGS += -L/usr/local/lib
> endif
>
> -LDFLAGS += -lpci -lz
> +LIBS += -lpci
>
I'm afraid removing -lz kills compilation on my openSUSE 10.3 because it
only ships libpci.a and not libpci.so.
>
> OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.o \
> sst28sf040.o am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o \
> @@ -45,11 +47,10 @@
> | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
>
> $(PROGRAM): $(OBJS)
> - $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
> - $(STRIP) $(STRIP_ARGS) $(PROGRAM)
> + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
>
> flashrom.o: flashrom.c
> - $(CC) -c $(CFLAGS) $(SVNDEF) $(CPPFLAGS) $< -o $@
> + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(SVNDEF) $< -o $@
>
> clean:
> rm -f $(PROGRAM) *.o
> @@ -58,15 +59,18 @@
> rm -f .dependencies
>
> dep:
> - @$(CC) $(SVNDEF) -MM *.c > .dependencies
> + @$(CC) $(CPPFLAGS) $(SVNDEF) -MM *.c > .dependencies
>
> +strip: $(PROGRAM)
> + $(STRIP) $(STRIP_ARGS) $(PROGRAM)
> +
> pciutils:
> @echo; printf "Checking for pciutils and zlib... "
> @$(shell ( echo "#include <pci/pci.h>"; \
> echo "struct pci_access *pacc;"; \
> echo "int main(int argc, char **argv)"; \
> echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c )
> - @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) >/dev/null 2>&1 && \
> + @$(CC) $(CFLAGS) $(LDFLAGS) .test.c -o .test $(LIBS) >/dev/null 2>&1 && \
> echo "found." || ( echo "not found."; echo; \
> echo "Please install pciutils-devel and zlib-devel."; \
> echo "See README for more information."; echo; \
> @@ -74,9 +78,9 @@
> @rm -f .test.c .test
>
> install: $(PROGRAM)
> - $(INSTALL) $(PROGRAM) $(PREFIX)/sbin
> - mkdir -p $(PREFIX)/share/man/man8
> - $(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
> + mkdir -p $(sbindir) $(man8dir)
> + $(INSTALL) -m 0755 $(PROGRAM) $(sbindir)
> + $(INSTALL) -m 0644 $(PROGRAM).8 $(man8dir)
>
> .PHONY: all clean distclean dep pciutils
>
>
>
>
Error message follows:
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `id_parse_list':
(.text+0x52c): undefined reference to `gzgets'
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `id_parse_list':
(.text+0x674): undefined reference to `gzeof'
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `pci_load_name_list':
(.text+0xb8d): undefined reference to `gzopen'
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `pci_load_name_list':
(.text+0xbe6): undefined reference to `gzclose'
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `pci_load_name_list':
(.text+0xca8): undefined reference to `gzopen'
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `pci_load_name_list':
(.text+0xccb): undefined reference to `gzerror'
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `pci_load_name_list':
(.text+0xce1): undefined reference to `gzclose'
/usr/lib/gcc/i586-suse-linux/4.2.1/../../../libpci.a(names.o): In
function `pci_load_name_list':
(.text+0xcf8): undefined reference to `gzclose'
collect2: ld returned 1 exit status
It should be possible to change .test.c compilation a bit to
automatically detect if we need -lz. Until then, I'd like to keep -lz in
LIBS.
As someone working quite a bit on flashrom, I am interested in keeping
it compilable on my machine ;-)
If you are OK with that change, I'd say
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Once I get a report that the patch works on a non-Linux arch and if
you're happy, I'll commit.
Regards,
Carl-Daniel
--
http://www.hailfinger.org/
More information about the coreboot
mailing list