diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-23 07:00:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-23 07:00:28 +0100 |
| commit | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch) | |
| tree | 5a4ac448a3b288b731c24d947e0ce52df3cab07b /dev-libs/libpcre2 | |
| parent | 8187a741807f3e9a9e26304973cf18087dcf2560 (diff) | |
gentoo resync : 23.06.2018
Diffstat (limited to 'dev-libs/libpcre2')
| -rw-r--r-- | dev-libs/libpcre2/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch | 16 | ||||
| -rw-r--r-- | dev-libs/libpcre2/libpcre2-10.31.ebuild | 4 |
3 files changed, 22 insertions, 1 deletions
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest index 206932103959..ce429f9f4335 100644 --- a/dev-libs/libpcre2/Manifest +++ b/dev-libs/libpcre2/Manifest @@ -1,5 +1,6 @@ +AUX libpcre2-10.31-cygwin.patch 370 BLAKE2B 3dd868d520c6c4f7f64213ce6854a3d603c6dfd26073eb36238dd04fe7ffb46395ec2002a519269ee28a31e1510251e2d532c46307f0fa2b332cbfe7306b09ed SHA512 7e1eaa3f9a9284c6a21e5971c1c37d8d032da15e7cf98b4b7814e502a3c76221e6939c332ccab0fad5b812c7d9dc55b26532a18a57f6ed715fca3eb79ca95200 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967 EBUILD libpcre2-10.30.ebuild 2335 BLAKE2B ffabdb786539182e475225186a21b27e1ef059e728af83696bcbf361d37cc98d13e124f4c51e89efbb9004e5a28fa9d0d995f5e21e469107adbf9ce1af6ca1f6 SHA512 89e37f6decc384fa5c499c3978a3eeae03144cf4340d94ec3e4f41fa507b57ad2f8ec2eb6a5dc37718e5eeaa37fad400077fe1d05c61f33606cc389b75dc79cf -EBUILD libpcre2-10.31.ebuild 2348 BLAKE2B 501e61f76820a596b4975bd0654981ac89be8da15c44cfab69abea1b1489eae80079855577d89200ecd96714b7d6a2307c0662cca4ec12cefc6ac67e6cf89f0b SHA512 3f6d74efd53d8466b67c6743801d73d2bb80e78e6dbf47d916d23be086245750d0a778cc81f146fe4d5e24fad9bbed28a5690da29fb12c4cc28d555052a293eb +EBUILD libpcre2-10.31.ebuild 2402 BLAKE2B cbd62bb53513a121a65e576bac4a48064b575c6ba0cc31b64c211c11c34acfb39b7bfd7ad3c3a67d9c4497c8820e8b55cf32ee5a8bcbd7abf3456e6b7b2be32c SHA512 0f1fdb609859b949c1b4b87a7113893e405fc3b1407bdcc31800e39638d9ed87fc4a4cc578204c4cbf7b5c8559fabaed59d9ac421fcb5e15c5bc8eab0c23143b MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8 diff --git a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch new file mode 100644 index 000000000000..3f3a33b366ad --- /dev/null +++ b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch @@ -0,0 +1,16 @@ +https://bugs.exim.org/show_bug.cgi?id=2152#c14 +https://vcs.pcre.org/pcre2?view=revision&revision=939 + +--- pcre2-10.31/src/pcre2grep.c ++++ pcre2-10.31/src/pcre2grep.c +@@ -64,8 +64,8 @@ + #endif + + /* Some cmake's define it still */ +-#if defined(__CYGWIN__) && !defined(WIN32) +-#define WIN32 ++#if defined(__CYGWIN__) && defined(WIN32) ++#undef WIN32 + #endif + + #ifdef WIN32 diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild b/dev-libs/libpcre2/libpcre2-10.31.ebuild index b3366003de68..6cd15f0dac3b 100644 --- a/dev-libs/libpcre2/libpcre2-10.31.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.31.ebuild @@ -30,6 +30,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )" +PATCHES=( + "${FILESDIR}"/${P}-cygwin.patch #633612 +) + S="${WORKDIR}/${MY_P}" MULTILIB_CHOST_TOOLS=( |