diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
| commit | 0c5c03d095485f7521d96cd44314f9a0ee826232 (patch) | |
| tree | 1df111a8270ba417537931cc6e1a4952b3000ee9 /patches/libpcap-1.0.0/link-force-overwrite.diff | |
| parent | d3ee0775cadf505c4bae7b1df483d73bf8294815 (diff) | |
| download | ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.gz ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.xz | |
* patches: remove 'generic'-layer
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10711 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/libpcap-1.0.0/link-force-overwrite.diff')
| -rw-r--r-- | patches/libpcap-1.0.0/link-force-overwrite.diff | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/patches/libpcap-1.0.0/link-force-overwrite.diff b/patches/libpcap-1.0.0/link-force-overwrite.diff new file mode 100644 index 000000000..00e67c041 --- /dev/null +++ b/patches/libpcap-1.0.0/link-force-overwrite.diff @@ -0,0 +1,52 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Subject: creakte hardlinks with force during install + +Without this patch a repeated "make install" fails, +because the destination of the links already exists from the +previous "make install". + +This patch add the "-f" parameter to "ln" to remove the link destination +in order to overwrite it. + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + Makefile.in | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +Index: libpcap-1.0.0/Makefile.in +=================================================================== +--- libpcap-1.0.0.orig/Makefile.in ++++ libpcap-1.0.0/Makefile.in +@@ -454,23 +454,23 @@ install: libpcap.a pcap-config + for i in $(MAN3PCAP); do \ + $(INSTALL_DATA) $(srcdir)/$$i \ + $(DESTDIR)$(mandir)/man3/$$i; done +- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_next.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap + for i in $(MANFILE); do \ + $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \ |