diff options
| author | Jonas Karlsson <jonaskarlsson@fripost.org> | 2020-08-25 23:47:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 14:47:28 -0700 |
| commit | 58fc7e5c010ebedae8f5cb8f335b1fd5c5d5a5b5 (patch) | |
| tree | 0a82b03011dc5fc40d013ac0a6081cb00f41391b | |
| parent | 05635bdf788413e0c5f49ea259984b60951890cf (diff) | |
| download | vcpkg-58fc7e5c010ebedae8f5cb8f335b1fd5c5d5a5b5.tar.gz vcpkg-58fc7e5c010ebedae8f5cb8f335b1fd5c5d5a5b5.zip | |
[irrlicht] Patch moved sysctl.h header file (#13137)
Sysctl has been deprecated for a while and in newer versions of glibc it
is removed which leads to a compilation error on modern Linux. This is
fixed in SVN trunk of irrlich so I copied the include guards from there.
In this case sysctl headers are only loaded for OS X where they are also
actually used.
| -rw-r--r-- | ports/irrlicht/fix-sysctl.patch | 12 | ||||
| -rw-r--r-- | ports/irrlicht/portfile.cmake | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ports/irrlicht/fix-sysctl.patch b/ports/irrlicht/fix-sysctl.patch new file mode 100644 index 000000000..98c70273e --- /dev/null +++ b/ports/irrlicht/fix-sysctl.patch @@ -0,0 +1,12 @@ +--- a/source/Irrlicht/COSOperator.cpp ++++ b/source/Irrlicht/COSOperator.cpp +@@ -11,8 +11,8 @@ + #else
+ #include <string.h>
+ #include <unistd.h>
+-#ifndef _IRR_SOLARIS_PLATFORM_
+ #include <sys/types.h>
++#ifdef _IRR_OSX_PLATFORM_
+ #include <sys/sysctl.h>
+ #endif
+ #endif
diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index cad4ca5a0..754119f3e 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_sourceforge( REF 1.8/1.8.4
FILENAME "irrlicht-1.8.4.zip"
SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
- PATCHES fix-encoding.patch
+ PATCHES fix-encoding.patch fix-sysctl.patch
)
configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
@@ -45,4 +45,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/irrlicht)
endif()
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|