diff options
Diffstat (limited to 'meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch index 7268d531d9..413ef0e1e5 100644 --- a/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch +++ b/meta/recipes-bsp/pciutils/pciutils-3.2.0/lib-build-fix.patch | |||
@@ -8,35 +8,33 @@ Upstream-Status: Pending | |||
8 | 7/30/2010 - created by Qing He <qing.he@intel.com> | 8 | 7/30/2010 - created by Qing He <qing.he@intel.com> |
9 | 9 | ||
10 | diff --git a/Makefile b/Makefile | 10 | diff --git a/Makefile b/Makefile |
11 | index 1b48e18..21af4b3 100644 | 11 | index 74c570a..31337e0 100644 |
12 | --- a/Makefile | 12 | --- a/Makefile |
13 | +++ b/Makefile | 13 | +++ b/Makefile |
14 | @@ -51,9 +51,9 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h | 14 | @@ -56,9 +56,9 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h |
15 | 15 | ||
16 | export | 16 | export |
17 | 17 | ||
18 | -all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) pcimodules pcimodules.8 | 18 | -all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) |
19 | +all: lib/$(PCILIB_DEV) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) pcimodules pcimodules.8 | 19 | +all: lib/$(PCILIB_DEV) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) |
20 | 20 | ||
21 | -lib/$(PCILIB): $(PCIINC) force | 21 | -lib/$(PCILIB): $(PCIINC) force |
22 | +lib/$(PCILIB) lib/$(PCILIB_DEV): $(PCIINC) force | 22 | +lib/$(PCILIB) lib/$(PCILIB_DEV): $(PCIINC) force |
23 | $(MAKE) -C lib all | 23 | $(MAKE) -C lib all |
24 | 24 | ||
25 | force: | 25 | force: |
26 | @@ -61,9 +61,9 @@ force: | 26 | @@ -66,8 +66,8 @@ force: |
27 | lib/config.h lib/config.mk: | 27 | lib/config.h lib/config.mk: |
28 | cd lib && ./configure | 28 | cd lib && ./configure |
29 | 29 | ||
30 | -pcimodules: pcimodules.o common.o lib/$(PCILIB) | ||
31 | -lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB) | 30 | -lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB) |
32 | -setpci: setpci.o common.o lib/$(PCILIB) | 31 | -setpci: setpci.o common.o lib/$(PCILIB) |
33 | +pcimodules: pcimodules.o common.o lib/$(PCILIB_DEV) | ||
34 | +lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB_DEV) | 32 | +lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB_DEV) |
35 | +setpci: setpci.o common.o lib/$(PCILIB_DEV) | 33 | +setpci: setpci.o common.o lib/$(PCILIB_DEV) |
36 | 34 | ||
37 | pcimodules.o: pcimodules.c pciutils.h | ||
38 | LSPCIINC=lspci.h pciutils.h $(PCIINC) | 35 | LSPCIINC=lspci.h pciutils.h $(PCIINC) |
39 | @@ -83,7 +83,7 @@ update-pciids: update-pciids.sh | 36 | lspci.o: lspci.c $(LSPCIINC) |
37 | @@ -89,7 +89,7 @@ update-pciids: update-pciids.sh | ||
40 | chmod +x $@ | 38 | chmod +x $@ |
41 | 39 | ||
42 | # The example of use of libpci | 40 | # The example of use of libpci |
@@ -69,10 +67,10 @@ index 1eb06a5..a8dab56 100644 | |||
69 | 67 | ||
70 | $(PCILIBPC): libpci.pc.in | 68 | $(PCILIBPC): libpci.pc.in |
71 | diff --git a/lib/configure b/lib/configure | 69 | diff --git a/lib/configure b/lib/configure |
72 | index eec225a..4318b05 100755 | 70 | index 27388bc..6c508cf 100755 |
73 | --- a/lib/configure | 71 | --- a/lib/configure |
74 | +++ b/lib/configure | 72 | +++ b/lib/configure |
75 | @@ -174,16 +193,18 @@ fi | 73 | @@ -216,16 +216,18 @@ fi |
76 | echo "Checking whether to build a shared library... $SHARED (set manually)" | 74 | echo "Checking whether to build a shared library... $SHARED (set manually)" |
77 | if [ "$SHARED" = no ] ; then | 75 | if [ "$SHARED" = no ] ; then |
78 | echo >>$m 'PCILIB=$(LIBNAME).a' | 76 | echo >>$m 'PCILIB=$(LIBNAME).a' |