Update glshim patches

This commit is contained in:
zador-blood-stained 2016-09-08 23:10:40 +03:00
parent 2e3fc55226
commit fb421f9b4f
3 changed files with 1036 additions and 9 deletions

View File

@ -122,6 +122,7 @@ chroot_build_packages()
chroot_prepare_distccd $release $arch
# DISTCC_TCP_DEFER_ACCEPT=0
DISTCC_CMDLIST=$DEST/buildpkg/distcc-wrappers/${release}-${arch}/cmdlist TMPDIR=/tmp/distcc distccd --daemon \
--pid-file /var/run/distcc/${release}-${arch}.pid --listen $distcc_bindaddr --allow 127.0.0.0/24 \
--log-file /tmp/distcc-${release}-${arch}.log --user distccd

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13ac06b..2b02ed4 100755
index 13ac06b..167c714 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,9 @@
@ -13,20 +13,22 @@ index 13ac06b..2b02ed4 100755
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -35,7 +37,10 @@ if(USE_DRAWTEX)
@@ -35,8 +37,12 @@ if(USE_DRAWTEX)
add_definitions(-DUSE_DRAWTEX)
endif()
-link_directories(${CMAKE_BINARY_DIR}/lib)
+set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PRIVATEDIR}"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+
add_definitions(-g -std=gnu99 -funwind-tables -O3 -fvisibility=hidden)
include_directories(include)
+include_directories(BEFORE SYSTEM include_mali)
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4cb3b30..af95bfd 100755
index 4cb3b30..3d926df 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,9 +16,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@ -44,14 +46,11 @@ index 4cb3b30..af95bfd 100755
aux_source_directory(preload PRELOAD_SOURCES)
add_library(preload SHARED ${PRELOAD_SOURCES})
@@ -27,3 +29,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -27,3 +29,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif()
add_subdirectory(proxy)
+
+INSTALL(TARGETS GL
+INSTALL(TARGETS GL preload
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install(TARGETS preload
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/glshim_preload")