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>

7 files changed, 8 insertions, 19 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 53cb185f1ae..420725a5f22 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,7 +49,7 @@ endif()
 ##############################################################################
 # install config
 ##############################################################################
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VPP_LIB_DIR_NAME}")
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_MESSAGE NEVER)
 
 include_directories (
diff --git a/src/cmake/cpu.cmake b/src/cmake/cpu.cmake
index 8ea050b4d23..bdc9014d944 100644
--- a/src/cmake/cpu.cmake
+++ b/src/cmake/cpu.cmake
@@ -55,7 +55,6 @@ set(VPP_LOG2_CACHE_LINE_SIZE ${VPP_LOG2_CACHE_LINE_SIZE}
 ##############################################################################
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
   set(CMAKE_C_FLAGS "-march=corei7 -mtune=corei7-avx ${CMAKE_C_FLAGS}")
-  set(VPP_LIB_DIR_NAME lib64)
   check_c_compiler_flag("-march=core-avx2" compiler_flag_march_core_avx2)
   if(compiler_flag_march_core_avx2)
     list(APPEND MARCH_VARIANTS "avx2\;-march=core-avx2 -mtune=core-avx2")
@@ -66,9 +65,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
   endif()
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
   set(CMAKE_C_FLAGS "-march=armv8-a+crc ${CMAKE_C_FLAGS}")
-  set(VPP_LIB_DIR_NAME lib64)
-else()
-  set(VPP_LIB_DIR_NAME lib)
 endif()
 
 macro(vpp_library_set_multiarch_sources lib)
diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index 04165ffb1e4..e0eb7af76fc 100644
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -33,7 +33,7 @@ macro(add_vpp_library lib)
   endif()
   install(
     TARGETS ${lib}
-    DESTINATION ${VPP_LIB_DIR_NAME}
+    DESTINATION lib
     COMPONENT ${ARG_COMPONENT}
   )
 
diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index c6f551dd3d5..39c940daed4 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -69,13 +69,13 @@ macro(add_vpp_plugin name)
       LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_api_test_plugins)
     install(
       TARGETS ${test_plugin_name}
-      DESTINATION ${VPP_LIB_DIR_NAME}/vpp_api_test_plugins
+      DESTINATION lib/vpp_api_test_plugins
       COMPONENT ${PLUGIN_COMPONENT}
     )
   endif()
   install(
     TARGETS ${plugin_name}
-    DESTINATION ${VPP_LIB_DIR_NAME}/vpp_plugins
+    DESTINATION lib/vpp_plugins
     COMPONENT ${PLUGIN_COMPONENT}
   )
 endmacro()
diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt
index 09ebd11dd8b..3199c3e43f0 100644
--- a/src/plugins/dpdk/CMakeLists.txt
+++ b/src/plugins/dpdk/CMakeLists.txt
@@ -14,9 +14,8 @@
 ##############################################################################
 # Find lib and include files
 ##############################################################################
-find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h HINTS
-	  ${DPDK_INCLUDE_DIR_HINT})
-find_library(DPDK_LIB NAMES libdpdk.a HINTS ${DPDK_LIB_DIR_HINT})
+find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h)
+find_library(DPDK_LIB NAMES libdpdk.a)
 
 ##############################################################################
 # Find DPDK Version
diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index 34631aa8e0f..979d41ab4c3 100644
--- a/src/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
@@ -135,7 +135,7 @@ cpu {
 
 # plugins {
 	## Adjusting the plugin path depending on where the VPP plugins are
-	#	path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins
+	#	path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins
 
 	## Disable all plugins by default and then selectively enable specific plugins
 	# plugin default { disable }
@@ -148,4 +148,4 @@ cpu {
 # }
 
 	## Alternate syntax to choose plugin path
-	# plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins
+	# plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins
diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index afe18c8fb40..db28662de4c 100644
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -58,16 +58,10 @@ vpp_find_plugin_path ()
   *p = 0;
 
   s = format (0, "%s/lib/vpp_plugins", path);
-#if uword_bits == 64
-  s = format (s, ":%s/lib64/vpp_plugins", path);
-#endif
   vec_add1 (s, 0);
   vlib_plugin_path = (char *) s;
 
   s = format (0, "%s/lib/vpp_api_test_plugins", path);
-#if uword_bits == 64
-  s = format (s, ":%s/lib64/vpp_api_test_plugins", path);
-#endif
   vec_add1 (s, 0);
   vat_plugin_path = (char *) s;
 }