From d6030887ffbc0d3a85dbe11e96f671011f5720dd Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Fri, 4 Mar 2022 03:11:05 -0500
Subject: libraries/cpprestsdk: Fix conflict with libwebsocketpp.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/cpprestsdk/cpprestsdk.SlackBuild | 25 ++++++++++++-------------
 libraries/cpprestsdk/slack-desc            |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'libraries/cpprestsdk')

diff --git a/libraries/cpprestsdk/cpprestsdk.SlackBuild b/libraries/cpprestsdk/cpprestsdk.SlackBuild
index cdccc3b71195..2d1047eebdd7 100644
--- a/libraries/cpprestsdk/cpprestsdk.SlackBuild
+++ b/libraries/cpprestsdk/cpprestsdk.SlackBuild
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220304 bkw: Modified by SlackBuilds.org: fix conflict with libwebsocketpp.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cpprestsdk
@@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -70,18 +69,21 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+# 20220304 bkw: explicitly disable websockets. attempting to build with
+# libwebsocketpp installed will fail, otherwise.
 mkdir -p Release/build
 cd Release/build
   cmake \
+    -DCPPREST_EXCLUDE_WEBSOCKETS=ON \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=format-truncation=" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -89,15 +91,12 @@ cd Release/build
     -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
-cd ../..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  make install/strip DESTDIR=$PKG
+cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar CONTRIBUTORS.txt  README.md  ThirdPartyNotices.txt license.txt Release/samples \
-       $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTORS.txt README.md ThirdPartyNotices.txt license.txt Release/samples \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/cpprestsdk/slack-desc b/libraries/cpprestsdk/slack-desc
index ee3144f5cc00..8e0da05681db 100644
--- a/libraries/cpprestsdk/slack-desc
+++ b/libraries/cpprestsdk/slack-desc
@@ -13,7 +13,7 @@ cpprestsdk: client-server communication in native code using a modern
 cpprestsdk: asynchronous C++ API design. This project aims to help
 cpprestsdk: C++ developers connect to and interact with services.
 cpprestsdk:
+cpprestsdk: Homepage: https://github.com/Microsoft/cpprestsdk
 cpprestsdk:
 cpprestsdk:
-cpprestsdk: https://github.com/Microsoft/cpprestsdk
 cpprestsdk:
-- 
cgit v1.2.3