0059-libpcap-fix-dependency-of-install-shared-so-make-target.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Thu, 21 Jul 2016 17:45:26 +0200
  3. Subject: libpcap: fix dependency of install-shared-so make target
  4. There seems to be a situation in which a rebuild of libpcap.so is triggered
  5. in the install step of the libpcap Makefile. libpcap.so is the wrong
  6. target, leading to the build failure reported in [1].
  7. Fix the dependency of install-shared-so to $(SHAREDLIB) so the build can
  8. succeed in this case.
  9. [1] https://dev.openwrt.org/ticket/19894
  10. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  11. Backport of LEDE b82c8ddf8c15e91d6eecfd6d237606a4ce1f756f
  12. diff --git a/package/libs/libpcap/patches/100-debian_shared_lib.patch b/package/libs/libpcap/patches/100-debian_shared_lib.patch
  13. index b294e51576f9b9f363fa0143bd0945f03f9d13cd..f8df7f3636cb62845930843a4b208fe4e91a54f2 100644
  14. --- a/package/libs/libpcap/patches/100-debian_shared_lib.patch
  15. +++ b/package/libs/libpcap/patches/100-debian_shared_lib.patch
  16. @@ -97,7 +97,7 @@ build a shared library.
  17. +grammar_pic.o: grammar.c
  18. + @rm -f $@
  19. -+ $(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
  20. ++ $(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
  21. +
  22. version.o: version.c
  23. $(CC) $(FULL_CFLAGS) -c version.c
  24. @@ -118,8 +118,12 @@ build a shared library.
  25. #
  26. # Generate the pcap-config script.
  27. #
  28. -@@ -618,11 +652,9 @@ install-shared: install-shared-$(DYEXT)
  29. - install-shared-so: libpcap.so
  30. +@@ -615,14 +649,12 @@ install: install-shared install-archive
  31. + $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
  32. +
  33. + install-shared: install-shared-$(DYEXT)
  34. +-install-shared-so: libpcap.so
  35. ++install-shared-so: $(SHAREDLIB)
  36. [ -d $(DESTDIR)$(libdir) ] || \
  37. (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
  38. - VER=`cat $(srcdir)/VERSION`; \