diff options
| author | James P. Harvey | 2019-08-20 07:57:43 -0400 |
|---|---|---|
| committer | James P. Harvey | 2019-08-20 07:57:43 -0400 |
| commit | b88f551d9fe07b552ba58de349232a6ff9698e1e (patch) | |
| tree | eeb30aaceb8dae782c456689106b0272b63b784f | |
| parent | c7d4e298df9deea793ea44e78a45cbc7a3bf0cb8 (diff) | |
| download | aur-b88f551d9fe07b552ba58de349232a6ff9698e1e.tar.gz | |
Add upstream patch to fix 4.2.0 build failure using system libraries.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | systemLibraries.patch | 15 |
3 files changed, 24 insertions, 1 deletions
@@ -24,9 +24,11 @@ pkgbase = mongodb source = http://downloads.mongodb.org/src/mongodb-src-r4.2.0.tar.gz source = mongodb.sysusers source = mongodb.tmpfiles + source = systemLibraries.patch sha256sums = c7214ee7bda3cf9566e8776a8978706d9827c1b09017e17b66a5a4e0c0731e1f sha256sums = 3757d548cfb0e697f59b9104f39a344bb3d15f802608085f838cb2495c065795 sha256sums = b7d18726225cd447e353007f896ff7e4cbedb2f641077bce70ab9d292e8f8d39 + sha256sums = 2879392baba8af386e623751818b692b8101ead6e9d4fe0de92fef97e54f284a pkgname = mongodb @@ -25,10 +25,12 @@ source=( "http://downloads.${pkgname}.org/src/${pkgname}-src-r${pkgver}.tar.gz" "${pkgname}.sysusers" "${pkgname}.tmpfiles" + "systemLibraries.patch" ) sha256sums=('c7214ee7bda3cf9566e8776a8978706d9827c1b09017e17b66a5a4e0c0731e1f' '3757d548cfb0e697f59b9104f39a344bb3d15f802608085f838cb2495c065795' - 'b7d18726225cd447e353007f896ff7e4cbedb2f641077bce70ab9d292e8f8d39') + 'b7d18726225cd447e353007f896ff7e4cbedb2f641077bce70ab9d292e8f8d39' + '2879392baba8af386e623751818b692b8101ead6e9d4fe0de92fef97e54f284a') _scons_args=( --use-system-pcre @@ -70,6 +72,10 @@ prepare() { # If MongoDB needs a long time to start, prevent systemd from restarting it every 90 seconds # See: https://jira.mongodb.org/browse/SERVER-38086 sed -i 's/\[Service]/[Service]\nTimeoutStartSec=infinity/' rpm/mongod.service + + # Allow 4.2.0 to use system libraries + # See: https://jira.mongodb.org/browse/SERVER-42787 + patch -Np1 -i "${srcdir}/systemLibraries.patch" } build() { diff --git a/systemLibraries.patch b/systemLibraries.patch new file mode 100644 index 000000000000..315ef70f2332 --- /dev/null +++ b/systemLibraries.patch @@ -0,0 +1,15 @@ +diff --git a/src/third_party/SConscript b/src/third_party/SConscript +index 5c0c129b30..6531300fee 100644 +--- a/src/third_party/SConscript ++++ b/src/third_party/SConscript +@@ -206,7 +206,9 @@ def injectThirdParty(thisEnv, libraries=[], parts=[]): + libraries = thisEnv.Flatten([libraries]) + parts = thisEnv.Flatten([parts]) + for lib in libraries: +- mods = thirdPartyEnvironmentModifications[lib] ++ mods = thirdPartyEnvironmentModifications.get(lib, None) ++ if not mods: ++ continue + if not parts: + thisEnv.PrependUnique(**mods) + else: |