diff --git a/gnu/local.mk b/gnu/local.mk index da5262dcf6..b0d51406d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -698,7 +698,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 73b4cff4c8..6b8eebcecb 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -56,8 +56,7 @@ (define-public boost version-with-underscores ".tar.bz2")))) (sha256 (base32 - "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")) - (patches (search-patches "boost-fix-icu-build.patch")))) + "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) ("zlib" ,zlib))) @@ -69,7 +68,6 @@ (define-public boost `(#:tests? #f #:make-flags (list "threading=multi" "link=shared" - "cxxflags=-std=c++14" ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" diff --git a/gnu/packages/patches/boost-fix-icu-build.patch b/gnu/packages/patches/boost-fix-icu-build.patch deleted file mode 100644 index 556f91b8f7..0000000000 --- a/gnu/packages/patches/boost-fix-icu-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -Pass -std=c++11 when compiling files that include the ICU headers. Without -this flag, compilation fails and causes Boost's build system to remove ICU -support. Note that $(pkg-config --variable=CXXFLAGS icu-uc) includes -"-std=c++11", but Boost's build system does not use 'pkg-config'. - ---- boost_1_66_0/libs/locale/build/Jamfile.v2.orig 2017-12-13 18:56:44.000000000 -0500 -+++ boost_1_66_0/libs/locale/build/Jamfile.v2 2018-04-08 15:18:58.673025760 -0400 -@@ -65,8 +65,8 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin shared ; -- ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin64 shared ; -+ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin shared ; -+ ICU64_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin64 shared ; - } - else - { -@@ -121,6 +121,7 @@ - explicit icuuc icudt icuin ; - - ICU_OPTS = $(ICU_PATH)/include -+ -std=c++11 - icuuc/shared/shared - icudt/shared/shared - icuin/shared/shared -@@ -180,6 +181,7 @@ - explicit icuuc_64 icudt_64 icuin_64 ; - - ICU64_OPTS = $(ICU_PATH)/include -+ -std=c++11 - icuuc_64/shared/shared - icudt_64/shared/shared - icuin_64/shared/shared ---- boost_1_66_0/libs/regex/build/Jamfile.v2.orig 2017-12-13 18:56:48.000000000 -0500 -+++ boost_1_66_0/libs/regex/build/Jamfile.v2 2018-04-08 15:20:40.865532505 -0400 -@@ -44,7 +44,7 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; -+ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; - } - else - { -@@ -78,6 +78,7 @@ - - ICU_OPTS = - $(ICU_PATH)/include -+ -std=c++11 - shared:icuuc/shared - shared:icudt/shared - shared:icuin/shared