diff options
Diffstat (limited to 'libraries/proxygen')
| -rw-r--r-- | libraries/proxygen/proxygen.SlackBuild | 9 | ||||
| -rw-r--r-- | libraries/proxygen/proxygen.info | 6 | ||||
| -rw-r--r-- | libraries/proxygen/proxygen.patch | 31 |
3 files changed, 29 insertions, 17 deletions
diff --git a/libraries/proxygen/proxygen.SlackBuild b/libraries/proxygen/proxygen.SlackBuild index 97f18399846cb..ad83bca4c3fd7 100644 --- a/libraries/proxygen/proxygen.SlackBuild +++ b/libraries/proxygen/proxygen.SlackBuild @@ -23,8 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=proxygen -VERSION=${VERSION:-20161230} -COMMIT=${COMMIT:-eb6235bf1f9c36756934b6619bf82a4070828288} +VERSION=${VERSION:-2017.03.20.00} GTEST_VERSION=${GTEST_VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$COMMMIT +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$COMMIT +cd $PRGNAM-$VERSION patch -p 1 < $CWD/proxygen.patch ( cd proxygen/lib/test tar xvf $CWD/googletest-release-${GTEST_VERSION}.tar.gz @@ -79,7 +78,7 @@ pushd proxygen cp $CWD/ax_prefix_config_h.m4 m4/ autoreconf -ivf CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++14" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/proxygen/proxygen.info b/libraries/proxygen/proxygen.info index ebe3176010635..e6707e784fe79 100644 --- a/libraries/proxygen/proxygen.info +++ b/libraries/proxygen/proxygen.info @@ -1,9 +1,9 @@ PRGNAM="proxygen" -VERSION="20161230" +VERSION="2017.03.20.00" HOMEPAGE="https://github.com/facebook/proxygen" -DOWNLOAD="https://github.com/facebook/proxygen/archive/eb6235b/proxygen-20161230.tar.gz \ +DOWNLOAD="https://github.com/facebook/proxygen/archive/v2017.03.20.00/proxygen-2017.03.20.00.tar.gz \ https://github.com/google/googletest/archive/release-1.8.0/googletest-release-1.8.0.tar.gz" -MD5SUM="63727aad4e3272c7a93c82a42a14c172 \ +MD5SUM="3e5a035ea42f1c23da3a0f9aacb1108c \ 16877098823401d1bf2ed7891d7dce36" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/libraries/proxygen/proxygen.patch b/libraries/proxygen/proxygen.patch index 32fd3c8947680..f81f039146119 100644 --- a/libraries/proxygen/proxygen.patch +++ b/libraries/proxygen/proxygen.patch @@ -1,15 +1,28 @@ -diff -ur proxygen-eb6235bf1f9c36756934b6619bf82a4070828288.old/proxygen/lib/test/Makefile.am proxygen-eb6235bf1f9c36756934b6619bf82a4070828288/proxygen/lib/test/Makefile.am ---- proxygen-eb6235bf1f9c36756934b6619bf82a4070828288.old/proxygen/lib/test/Makefile.am 2016-12-30 17:26:15.000000000 -0200 -+++ proxygen-eb6235bf1f9c36756934b6619bf82a4070828288/proxygen/lib/test/Makefile.am 2017-01-04 23:48:53.053074604 -0200 -@@ -2,11 +2,6 @@ +diff -ur proxygen-2017.03.20.00.old/proxygen/lib/test/Makefile.am proxygen-2017.03.20.00/proxygen/lib/test/Makefile.am +--- proxygen-2017.03.20.00.old/proxygen/lib/test/Makefile.am 2017-03-19 00:24:54.000000000 -0300 ++++ proxygen-2017.03.20.00/proxygen/lib/test/Makefile.am 2017-03-22 23:55:45.868057488 -0300 +@@ -2,17 +2,17 @@ BUILT_SOURCES = googletest-release-1.8.0/googletest/src/gtest-all.cc --googletest-release-1.8.0/googletest/src/gtest-all.cc: +-release-1.8.0.zip: - wget https://github.com/google/googletest/archive/release-1.8.0.zip ++#release-1.8.0.zip: ++# wget https://github.com/google/googletest/archive/release-1.8.0.zip + + # The SHA1 test is in a separate rule from the fetch, because otherwise + # `make` would run `sha1sum` **before** wget. We'd re-extract the archive + # without `touch`, since the contents' timestamps are older than the zip's. +-googletest-release-1.8.0/googletest/src/gtest-all.cc: release-1.8.0.zip +- [ "$(shell sha1sum release-1.8.0.zip | awk '{print $$1}')" == \ +- "667f873ab7a4d246062565fad32fb6d8e203ee73" ] - unzip release-1.8.0.zip -- -- - check_LTLIBRARIES = libtesttransport.la - libtesttransport_la_SOURCES = TestAsyncTransport.cpp +- touch googletest-release-1.8.0/googletest/src/gtest-all.cc ++#googletest-release-1.8.0/googletest/src/gtest-all.cc: release-1.8.0.zip ++# [ "$(shell sha1sum release-1.8.0.zip | awk '{print $$1}')" == \ ++# "667f873ab7a4d246062565fad32fb6d8e203ee73" ] ++# unzip release-1.8.0.zip ++# touch googletest-release-1.8.0/googletest/src/gtest-all.cc + + check_LTLIBRARIES = libtesttransport.la |