mirror of https://git.wownero.com/dsc/mxe.git
libarchive: remove merged patch
This commit is contained in:
parent
6d05c319d1
commit
b12b7ead05
|
@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "fix@me" <fix@me>
|
||||
Date: Tue, 14 Feb 2012 12:40:24 +0100
|
||||
Subject: [PATCH 1/2] fix pkg-config
|
||||
Subject: [PATCH 1/1] fix pkg-config
|
||||
|
||||
|
||||
diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in
|
||||
|
@ -18,23 +18,3 @@ index 1111111..2222222 100644
|
|||
Libs: -L${libdir} -larchive
|
||||
-Libs.private: @LIBS@
|
||||
+Libs.private: @LIBS@ -liconv
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sun, 13 Aug 2017 14:38:47 +1000
|
||||
Subject: [PATCH 2/2] libarchive.pc.in: add Cflags.private for static linking
|
||||
|
||||
taken from:
|
||||
https://github.com/libarchive/libarchive/pull/934
|
||||
|
||||
diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/build/pkgconfig/libarchive.pc.in
|
||||
+++ b/build/pkgconfig/libarchive.pc.in
|
||||
@@ -7,5 +7,6 @@ Name: libarchive
|
||||
Description: library that can create and read several streaming archive formats
|
||||
Version: @VERSION@
|
||||
Cflags: -I${includedir}
|
||||
+Cflags.private: -DLIBARCHIVE_STATIC
|
||||
Libs: -L${libdir} -larchive
|
||||
Libs.private: @LIBS@ -liconv
|
||||
|
|
Loading…
Reference in New Issue