Mercurial > vanilla
diff qt/qtbase/patch-fhs.patch @ 766:e91fbcb3d1ef
vanilla: consolidate FHS
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 09 Aug 2019 20:10:00 +0200 |
parents | |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt/qtbase/patch-fhs.patch Fri Aug 09 20:10:00 2019 +0200 @@ -0,0 +1,50 @@ +--- ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-08-09 09:56:10.122995996 +0200 ++++ ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-08-09 09:56:42.942997004 +0200 +@@ -3,30 +3,6 @@ + message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") + endif() + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") +--- qmake/generators/makefile.cpp.orig 2019-08-09 09:58:25.371000151 +0200 ++++ qmake/generators/makefile.cpp 2019-08-09 10:00:19.407003654 +0200 +@@ -3298,10 +3298,10 @@ + if(includeDir.isEmpty()) + includeDir = prefix + "/include"; + +- t << "prefix=" << prefix << endl; +- t << "exec_prefix=${prefix}\n" +- << "libdir=" << pkgConfigFixPath(libDir) << "\n" +- << "includedir=" << pkgConfigFixPath(includeDir) << endl; ++ t << "prefix=" << endl; ++ t << "exec_prefix=\n" ++ << "libdir=/lib\n" ++ << "includedir=/include\n"; + t << endl; + + //extra PKGCONFIG variables