Alexander Pyhalov
2016-10-20 b09f37e70f275ec62a14eb950300b3bee2ec5657
percona-server-57: update to 5.7.14-8, remove gcc runtime copies
1 files added
3 files modified
83 ■■■■ changed files
components/database/percona-server-57/Makefile 7 ●●●●● patch | view | raw | blame | history
components/database/percona-server-57/manifests/sample-manifest.p5m 12 ●●●●● patch | view | raw | blame | history
components/database/percona-server-57/patches/09-rpath.patch 60 ●●●●● patch | view | raw | blame | history
components/database/percona-server-57/percona-server-57lib.p5m 4 ●●●● patch | view | raw | blame | history
components/database/percona-server-57/Makefile
@@ -15,13 +15,12 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        percona-server
COMPONENT_VERSION=    5.7.14-7
COMPONENT_REVISION=    1
IPS_COMPONENT_VERSION=    5.7.14.7
COMPONENT_VERSION=    5.7.14-8
IPS_COMPONENT_VERSION=    5.7.14.8
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_PROJECT_URL=    http://www.percona.com/
COMPONENT_ARCHIVE_HASH=    sha256:b204ffac56bfc8cf092acca3ce73d63b00450b59f554acd1daeb5a573eec2c1d
COMPONENT_ARCHIVE_HASH=    sha256:9a842bdbfb052edeee6f85d4ee977b2b4e1a8ac67d88e5d248d83474682d401e
COMPONENT_ARCHIVE_URL=    http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-$(COMPONENT_VERSION)/source/tarball/$(COMPONENT_ARCHIVE)
# We need specific boost version
components/database/percona-server-57/manifests/sample-manifest.p5m
@@ -213,8 +213,6 @@
file path=usr/percona-server/5.7/include/thr_mutex.h
file path=usr/percona-server/5.7/include/thr_rwlock.h
file path=usr/percona-server/5.7/include/typelib.h
link path=usr/percona-server/5.7/lib/$(MACH64)/libgcc_s.so target=libgcc_s.so.1
file path=usr/percona-server/5.7/lib/$(MACH64)/libgcc_s.so.1
file path=usr/percona-server/5.7/lib/$(MACH64)/libmysqld.a
file path=usr/percona-server/5.7/lib/$(MACH64)/libmysqlservices.a
file path=usr/percona-server/5.7/lib/$(MACH64)/libperconaserverclient.a
@@ -223,11 +221,6 @@
link path=usr/percona-server/5.7/lib/$(MACH64)/libperconaserverclient.so.20 \
    target=libperconaserverclient.so.20.3.1
file path=usr/percona-server/5.7/lib/$(MACH64)/libperconaserverclient.so.20.3.1
link path=usr/percona-server/5.7/lib/$(MACH64)/libstdc++.so \
    target=libstdc++.so.6.0.20
link path=usr/percona-server/5.7/lib/$(MACH64)/libstdc++.so.6 \
    target=libstdc++.so.6.0.20
file path=usr/percona-server/5.7/lib/$(MACH64)/libstdc++.so.6.0.20
file path=usr/percona-server/5.7/lib/$(MACH64)/pkgconfig/perconaserverclient.pc
file path=usr/percona-server/5.7/lib/$(MACH64)/plugin/adt_null.so
file path=usr/percona-server/5.7/lib/$(MACH64)/plugin/audit_log.so
@@ -280,8 +273,6 @@
file path=usr/percona-server/5.7/lib/$(MACH64)/plugin/test_udf_services.so
file path=usr/percona-server/5.7/lib/$(MACH64)/plugin/validate_password.so
file path=usr/percona-server/5.7/lib/$(MACH64)/plugin/version_token.so
link path=usr/percona-server/5.7/lib/libgcc_s.so target=libgcc_s.so.1
file path=usr/percona-server/5.7/lib/libgcc_s.so.1
file path=usr/percona-server/5.7/lib/libmysqld.a
file path=usr/percona-server/5.7/lib/libmysqlservices.a
file path=usr/percona-server/5.7/lib/libperconaserverclient.a
@@ -290,9 +281,6 @@
link path=usr/percona-server/5.7/lib/libperconaserverclient.so.20 \
    target=libperconaserverclient.so.20.3.1
file path=usr/percona-server/5.7/lib/libperconaserverclient.so.20.3.1
link path=usr/percona-server/5.7/lib/libstdc++.so target=libstdc++.so.6.0.20
link path=usr/percona-server/5.7/lib/libstdc++.so.6 target=libstdc++.so.6.0.20
file path=usr/percona-server/5.7/lib/libstdc++.so.6.0.20
file path=usr/percona-server/5.7/lib/pkgconfig/perconaserverclient.pc
file path=usr/percona-server/5.7/lib/plugin/adt_null.so
file path=usr/percona-server/5.7/lib/plugin/audit_log.so
components/database/percona-server-57/patches/09-rpath.patch
New file
@@ -0,0 +1,60 @@
Don't be too clever about adding -R/usr/gcc/x.y/lib
--- percona-server-5.7.14-8/configure.cmake.1    2016-10-20 20:09:22.782988625 +0300
+++ percona-server-5.7.14-8/configure.cmake    2016-10-20 20:11:00.568278994 +0300
@@ -146,55 +146,6 @@
     "${CMAKE_SHARED_LIBRARY_C_FLAGS} -R'\$ORIGIN/../'${INSTALL_LIBDIR} -R${LIBRARY_PATH}")
 ENDMACRO()
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC)
-  DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
-  SET(LIB_SUFFIX "lib")
-  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
-    SET(LIB_SUFFIX "lib/sparcv9")
-  ENDIF()
-  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
-    SET(LIB_SUFFIX "lib/amd64")
-  ENDIF()
-  FIND_LIBRARY(GPP_LIBRARY_NAME
-    NAMES "stdc++"
-    PATHS ${CXX_PATH}/../${LIB_SUFFIX}
-    NO_DEFAULT_PATH
-  )
-  MESSAGE(STATUS "GPP_LIBRARY_NAME ${GPP_LIBRARY_NAME}")
-  IF(GPP_LIBRARY_NAME)
-    DIRNAME(${GPP_LIBRARY_NAME} GPP_LIBRARY_PATH)
-    FIND_REAL_LIBRARY(${GPP_LIBRARY_NAME} real_library)
-    MESSAGE(STATUS "INSTALL ${GPP_LIBRARY_NAME} ${real_library}")
-    INSTALL(FILES ${GPP_LIBRARY_NAME} ${real_library}
-            DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
-    EXTEND_CXX_LINK_FLAGS(${GPP_LIBRARY_PATH})
-    EXECUTE_PROCESS(
-      COMMAND sh -c "elfdump ${real_library} | grep SONAME"
-      RESULT_VARIABLE result
-      OUTPUT_VARIABLE sonameline
-    )
-    IF(NOT result)
-      STRING(REGEX MATCH "libstdc.*[^\n]" soname ${sonameline})
-      MESSAGE(STATUS "INSTALL ${GPP_LIBRARY_PATH}/${soname}")
-      INSTALL(FILES "${GPP_LIBRARY_PATH}/${soname}"
-              DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
-    ENDIF()
-  ENDIF()
-  FIND_LIBRARY(GCC_LIBRARY_NAME
-    NAMES "gcc_s"
-    PATHS ${CXX_PATH}/../${LIB_SUFFIX}
-    NO_DEFAULT_PATH
-  )
-  IF(GCC_LIBRARY_NAME)
-    DIRNAME(${GCC_LIBRARY_NAME} GCC_LIBRARY_PATH)
-    FIND_REAL_LIBRARY(${GCC_LIBRARY_NAME} real_library)
-    MESSAGE(STATUS "INSTALL ${GCC_LIBRARY_NAME} ${real_library}")
-    INSTALL(FILES ${GCC_LIBRARY_NAME} ${real_library}
-            DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
-    EXTEND_C_LINK_FLAGS(${GCC_LIBRARY_PATH})
-  ENDIF()
-ENDIF()
-
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
    CMAKE_C_COMPILER_ID MATCHES "SunPro" AND
    CMAKE_CXX_FLAGS MATCHES "stlport4")
components/database/percona-server-57/percona-server-57lib.p5m
@@ -136,8 +136,6 @@
file path=usr/percona-server/5.7/include/thr_mutex.h
file path=usr/percona-server/5.7/include/thr_rwlock.h
file path=usr/percona-server/5.7/include/typelib.h
link path=usr/percona-server/5.7/lib/$(MACH64)/libgcc_s.so target=libgcc_s.so.1
file path=usr/percona-server/5.7/lib/$(MACH64)/libgcc_s.so.1
file path=usr/percona-server/5.7/lib/$(MACH64)/libmysqld.a
file path=usr/percona-server/5.7/lib/$(MACH64)/libmysqlservices.a
file path=usr/percona-server/5.7/lib/$(MACH64)/libperconaserverclient.a
@@ -152,8 +150,6 @@
#    target=libstdc++.so.6.0.20
#file path=usr/percona-server/5.7/lib/$(MACH64)/libstdc++.so.6.0.20
file path=usr/percona-server/5.7/lib/$(MACH64)/pkgconfig/perconaserverclient.pc
link path=usr/percona-server/5.7/lib/libgcc_s.so target=libgcc_s.so.1
file path=usr/percona-server/5.7/lib/libgcc_s.so.1
file path=usr/percona-server/5.7/lib/libmysqld.a
file path=usr/percona-server/5.7/lib/libmysqlservices.a
file path=usr/percona-server/5.7/lib/libperconaserverclient.a