From 79dcbc74cd417f4caf41bc398ccba94cab7d656b Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 12 Sep 2018 14:01:10 +0200
Subject: Always use 'lib' instead of 'lib64'

It is packaging responsibility to put libs in the right place.
Use of lib64 resulted in huge amount of files with hardcoded lib64.
This patch simplifies things...

Change-Id: Iab0dea0583e480907732c5d2379eb951a00fa9e6
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 extras/vcl-ldpreload/README.md                 | 2 +-
 extras/vcl-ldpreload/test/common/nginx_test.sh | 4 ++--
 extras/vcl-ldpreload/test/curl_test.sh         | 2 +-
 extras/vcl-ldpreload/test/wget_test.sh         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'extras/vcl-ldpreload')

diff --git a/extras/vcl-ldpreload/README.md b/extras/vcl-ldpreload/README.md
index b40c4c5ad07..c07b4184be8 100644
--- a/extras/vcl-ldpreload/README.md
+++ b/extras/vcl-ldpreload/README.md
@@ -4,7 +4,7 @@ User can LD_PRELOAD any application that uses POSIX socket API.
 
 NOTE: The sources have been moved to .../vpp/src/vcl and libvcl_ldpreload.so
       libvcl-ldpreload.so is built with VPP and can be found in
-      .../vpp/build-root/install-vpp[_debug]-native/vpp/lib64
+      .../vpp/build-root/install-vpp[_debug]-native/vpp/lib
 
 ## HowTo
 
diff --git a/extras/vcl-ldpreload/test/common/nginx_test.sh b/extras/vcl-ldpreload/test/common/nginx_test.sh
index ea771038658..73f2911b57c 100755
--- a/extras/vcl-ldpreload/test/common/nginx_test.sh
+++ b/extras/vcl-ldpreload/test/common/nginx_test.sh
@@ -33,7 +33,7 @@ fi
 if [ -z "$VCL_LDPRELOAD_LIB_DIR" ] ; then
     echo "ERROR: VCL_LDPRELOAD_LIB_DIR environment variable not set!" >&2
     echo "       Please set VCL_LDPRELOAD_LIB_DIR to " >&2
-    echo "       $WS_ROOT/build-root/install-vpp[_debug]-native/vpp/lib64." >&2
+    echo "       $WS_ROOT/build-root/install-vpp[_debug]-native/vpp/lib." >&2
     exit 1
 fi
 
@@ -76,7 +76,7 @@ else
         echo "docker run --rm --name $vpp_dk_name -v $LDP_TEST_DIR/common/nginx_welcome.html:/usr/share/nginx/html/index.html:ro -d nginx"
         docker run --rm --name $vpp_dk_name -v $LDP_TEST_DIR/common/nginx_welcome.html:/usr/share/nginx/html/index.html:ro -d nginx
         
-        export LD_LIBRARY_PATH="$WS_ROOT/build-root/install-vpp${debug}-native/vpp/lib64/:$LDP_DIR/src/.libs:"
+        export LD_LIBRARY_PATH="$WS_ROOT/build-root/install-vpp${debug}-native/vpp/lib/:$LDP_DIR/src/.libs:"
 
         # Extract nginx IPv4 address from docker bridge
         #
diff --git a/extras/vcl-ldpreload/test/curl_test.sh b/extras/vcl-ldpreload/test/curl_test.sh
index 24b0c6e06d1..5c8d2f4a9d4 100755
--- a/extras/vcl-ldpreload/test/curl_test.sh
+++ b/extras/vcl-ldpreload/test/curl_test.sh
@@ -16,7 +16,7 @@ fi
 
 LDP_DIR="${WS_ROOT}/extras/vcl-ldpreload"
 LDP_TEST_DIR="${LDP_TEST_DIR:-${LDP_DIR}/test}"
-VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-${WS_ROOT}/build-root/install-vpp_debug-native/vpp/lib64}"
+VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-${WS_ROOT}/build-root/install-vpp_debug-native/vpp/lib}"
 
 TEST_APP="${TEST_APP:-curl}"
 source $LDP_TEST_DIR/common/nginx_test.sh
diff --git a/extras/vcl-ldpreload/test/wget_test.sh b/extras/vcl-ldpreload/test/wget_test.sh
index a2663d71158..78b34f9e481 100755
--- a/extras/vcl-ldpreload/test/wget_test.sh
+++ b/extras/vcl-ldpreload/test/wget_test.sh
@@ -16,7 +16,7 @@ fi
 
 LDP_DIR="${WS_ROOT}/extras/vcl-ldpreload"
 LDP_TEST_DIR="${LDP_TEST_DIR:-${LDP_DIR}/test}"
-VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib64}"
+VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib}"
 
 TEST_APP="${TEST_APP:-wget}"
 source $LDP_TEST_DIR/common/nginx_test.sh
-- 
cgit 1.2.3-korg