itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #985 from myfreeweb/master

Browse Source 
Fix build on FreeBSD
master
Drew DeVault 8 years ago committed by GitHub
parent d93e53fd4b da26d69cb1
commit 6350752d6b
11 changed files with 127 additions and 103 deletions
Show Stats Download Patch File Download Diff File

61
CMake/FindCairo.cmake
Unescape View File

@ -8,40 +8,35 @@
# Define CAIRO_MIN_VERSION for which version desired. # Define CAIRO_MIN_VERSION for which version desired.
# #
INCLUDE(FindPkgConfig) find_package(PkgConfig)
IF(Cairo_FIND_REQUIRED) if(Cairo_FIND_REQUIRED)
SET(_pkgconfig_REQUIRED "REQUIRED") set(_pkgconfig_REQUIRED "REQUIRED")
ELSE(Cairo_FIND_REQUIRED) else(Cairo_FIND_REQUIRED)
SET(_pkgconfig_REQUIRED "") set(_pkgconfig_REQUIRED "")
ENDIF(Cairo_FIND_REQUIRED) endif(Cairo_FIND_REQUIRED)
IF(CAIRO_MIN_VERSION) if(CAIRO_MIN_VERSION)
PKG_SEARCH_MODULE(CAIRO ${_pkgconfig_REQUIRED} cairo>=${CAIRO_MIN_VERSION}) pkg_check_modules(CAIRO ${_pkgconfig_REQUIRED} cairo>=${CAIRO_MIN_VERSION})
ELSE(CAIRO_MIN_VERSION) else(CAIRO_MIN_VERSION)
PKG_SEARCH_MODULE(CAIRO ${_pkgconfig_REQUIRED} cairo) pkg_check_modules(CAIRO ${_pkgconfig_REQUIRED} cairo)
ENDIF(CAIRO_MIN_VERSION) endif(CAIRO_MIN_VERSION)
IF(NOT CAIRO_FOUND AND NOT PKG_CONFIG_FOUND) if(NOT CAIRO_FOUND AND NOT PKG_CONFIG_FOUND)
FIND_PATH(CAIRO_INCLUDE_DIRS cairo.h) find_path(CAIRO_INCLUDE_DIRS cairo.h)
FIND_LIBRARY(CAIRO_LIBRARIES cairo) find_library(CAIRO_LIBRARIES cairo)
else(NOT CAIRO_FOUND AND NOT PKG_CONFIG_FOUND)
# Make paths absolute https://stackoverflow.com/a/35476270
# Important on FreeBSD because /usr/local/lib is not on /usr/bin/ld's default path
set(CAIRO_LIBS_ABSOLUTE)
foreach(lib ${CAIRO_LIBRARIES})
set(var_name CAIRO_${lib}_ABS)
find_library(${var_name} ${lib} ${CAIRO_LIBRARY_DIRS})
list(APPEND CAIRO_LIBS_ABSOLUTE ${${var_name}})
endforeach()
set(CAIRO_LIBRARIES ${CAIRO_LIBS_ABSOLUTE})
endif(NOT CAIRO_FOUND AND NOT PKG_CONFIG_FOUND)
# Report results include(FindPackageHandleStandardArgs)
IF(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIRS) find_package_handle_standard_args(CAIRO DEFAULT_MSG CAIRO_LIBRARIES CAIRO_INCLUDE_DIRS)
SET(CAIRO_FOUND 1) mark_as_advanced(CAIRO_LIBRARIES CAIRO_INCLUDE_DIRS)
IF(NOT Cairo_FIND_QUIETLY)
MESSAGE(STATUS "Found Cairo: ${CAIRO_LIBRARIES}")
ENDIF(NOT Cairo_FIND_QUIETLY)
ELSE(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIRS)
IF(Cairo_FIND_REQUIRED)
MESSAGE(SEND_ERROR "Could not find Cairo")
ELSE(Cairo_FIND_REQUIRED)
IF(NOT Cairo_FIND_QUIETLY)
MESSAGE(STATUS "Could not find Cairo")
ENDIF(NOT Cairo_FIND_QUIETLY)
ENDIF(Cairo_FIND_REQUIRED)
ENDIF(CAIRO_LIBRARIES AND CAIRO_INCLUDE_DIRS)
ENDIF(NOT CAIRO_FOUND AND NOT PKG_CONFIG_FOUND)
# Hide advanced variables from CMake GUIs
MARK_AS_ADVANCED(CAIRO_LIBRARIES CAIRO_INCLUDE_DIRS)

17
CMake/FindEpollShim.cmake
Unescape View File

@ -0,0 +1,17 @@
# - Find EpollShim
# Once done, this will define
#
# EPOLLSHIM_FOUND - System has EpollShim
# EPOLLSHIM_INCLUDE_DIRS - The EpollShim include directories
# EPOLLSHIM_LIBRARIES - The libraries needed to use EpollShim
find_path(EPOLLSHIM_INCLUDE_DIRS NAMES sys/epoll.h sys/timerfd.h HINTS /usr/local/include/libepoll-shim)
find_library(EPOLLSHIM_LIBRARIES NAMES epoll-shim libepoll-shim HINTS /usr/local/lib)
if (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
set(EPOLLSHIM_FOUND TRUE)
endif (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(EPOLLSHIM DEFAULT_MSG EPOLLSHIM_LIBRARIES EPOLLSHIM_INCLUDE_DIRS)
mark_as_advanced(EPOLLSHIM_INCLUDE_DIRS EPOLLSHIM_LIBRARIES)

63
CMake/FindGdkPixbuf.cmake
Unescape View File

@ -8,43 +8,36 @@
# Define GDK_PIXBUF_MIN_VERSION for which version desired. # Define GDK_PIXBUF_MIN_VERSION for which version desired.
# #
INCLUDE(FindPkgConfig) find_package(PkgConfig)
IF(GdkPixbuf_FIND_REQUIRED) if(GdkPixbuf_FIND_REQUIRED)
SET(_pkgconfig_REQUIRED "REQUIRED") set(_pkgconfig_REQUIRED "REQUIRED")
ELSE(GdkPixbuf_FIND_REQUIRED) else(GdkPixbuf_FIND_REQUIRED)
SET(_pkgconfig_REQUIRED "") set(_pkgconfig_REQUIRED "")
ENDIF(GdkPixbuf_FIND_REQUIRED) endif(GdkPixbuf_FIND_REQUIRED)
IF(GDK_PIXBUF_MIN_VERSION) if(GDK_PIXBUF_MIN_VERSION)
PKG_SEARCH_MODULE(GDK_PIXBUF ${_pkgconfig_REQUIRED} "gdk-pixbuf-2.0>=${GDK_PIXBUF_MIN_VERSION}") pkg_check_modules(GDK_PIXBUF ${_pkgconfig_REQUIRED} "gdk-pixbuf-2.0>=${GDK_PIXBUF_MIN_VERSION}")
ELSE(GDK_PIXBUF_MIN_VERSION) else(GDK_PIXBUF_MIN_VERSION)
PKG_SEARCH_MODULE(GDK_PIXBUF ${_pkgconfig_REQUIRED} "gdk-pixbuf-2.0") pkg_check_modules(GDK_PIXBUF ${_pkgconfig_REQUIRED} "gdk-pixbuf-2.0")
ENDIF(GDK_PIXBUF_MIN_VERSION) endif(GDK_PIXBUF_MIN_VERSION)
IF(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND) if(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND)
FIND_PATH(GDK_PIXBUF_INCLUDE_DIRS gdk-pixbuf/gdk-pixbuf.h) find_path(GDK_PIXBUF_INCLUDE_DIRS gdk-pixbuf/gdk-pixbuf.h)
FIND_LIBRARY(GDK_PIXBUF_LIBRARIES gdk_pixbuf-2.0) find_library(GDK_PIXBUF_LIBRARIES gdk_pixbuf-2.0)
else(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND)
# Report results
IF(GDK_PIXBUF_LIBRARIES AND GDK_PIXBUF_INCLUDE_DIRS)
SET(GDK_PIXBUF_FOUND 1)
SET(GdkPixbuf_FOUND 1)
IF(NOT GdkPixbuf_FIND_QUIETLY)
MESSAGE(STATUS "Found GdkPixbuf: ${GDK_PIXBUF_LIBRARIES}")
ENDIF(NOT GdkPixbuf_FIND_QUIETLY)
ELSE(GDK_PIXBUF_LIBRARIES AND GDK_PIXBUF_INCLUDE_DIRS)
IF(GdkPixbuf_FIND_REQUIRED)
MESSAGE(SEND_ERROR "Could not find GdkPixbuf")
ELSE(GdkPixbuf_FIND_REQUIRED)
IF(NOT GdkPixbuf_FIND_QUIETLY)
MESSAGE(STATUS "Could not find GdkPixbuf")
ENDIF(NOT GdkPixbuf_FIND_QUIETLY)
ENDIF(GdkPixbuf_FIND_REQUIRED)
ENDIF(GDK_PIXBUF_LIBRARIES AND GDK_PIXBUF_INCLUDE_DIRS)
ELSE(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND)
SET(GdkPixbuf_FOUND 1) SET(GdkPixbuf_FOUND 1)
ENDIF(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND) # Make paths absolute https://stackoverflow.com/a/35476270
# Important on FreeBSD because /usr/local/lib is not on /usr/bin/ld's default path
set(GDK_PIXBUF_LIBS_ABSOLUTE)
foreach(lib ${GDK_PIXBUF_LIBRARIES})
set(var_name GDK_PIXBUF_${lib}_ABS)
find_library(${var_name} ${lib} ${GDK_PIXBUF_LIBRARY_DIRS})
list(APPEND GDK_PIXBUF_LIBS_ABSOLUTE ${${var_name}})
endforeach()
set(GDK_PIXBUF_LIBRARIES ${GDK_PIXBUF_LIBS_ABSOLUTE})
endif(NOT GDK_PIXBUF_FOUND AND NOT PKG_CONFIG_FOUND)
# Hide advanced variables from CMake GUIs include(FindPackageHandleStandardArgs)
MARK_AS_ADVANCED(GDK_PIXBUF_LIBRARIES GDK_PIXBUF_INCLUDE_DIRS) find_package_handle_standard_args(GDK_PIXBUF DEFAULT_MSG GDK_PIXBUF_LIBRARIES GDK_PIXBUF_INCLUDE_DIRS)
mark_as_advanced(GDK_PIXBUF_LIBRARIES GDK_PIXBUF_INCLUDE_DIRS)

61
CMake/FindPango.cmake
Unescape View File

@ -8,40 +8,35 @@
# Define PANGO_MIN_VERSION for which version desired. # Define PANGO_MIN_VERSION for which version desired.
# #
INCLUDE(FindPkgConfig) find_package(PkgConfig)
IF(Pango_FIND_REQUIRED) if(Pango_FIND_REQUIRED)
SET(_pkgconfig_REQUIRED "REQUIRED") set(_pkgconfig_REQUIRED "REQUIRED")
ELSE(Pango_FIND_REQUIRED) else(Pango_FIND_REQUIRED)
SET(_pkgconfig_REQUIRED "") set(_pkgconfig_REQUIRED "")
ENDIF(Pango_FIND_REQUIRED) endif(Pango_FIND_REQUIRED)
IF(PANGO_MIN_VERSION) if(PANGO_MIN_VERSION)
PKG_SEARCH_MODULE(PANGO ${_pkgconfig_REQUIRED} "pango>=${PANGO_MIN_VERSION} pangocairo>=${PANGO_MIN_VERSION}") pkg_check_modules(PANGO ${_pkgconfig_REQUIRED} "pango>=${PANGO_MIN_VERSION}" "pangocairo>=${PANGO_MIN_VERSION}")
ELSE(PANGO_MIN_VERSION) else(PANGO_MIN_VERSION)
PKG_SEARCH_MODULE(PANGO ${_pkgconfig_REQUIRED} "pango pangocairo") pkg_check_modules(PANGO ${_pkgconfig_REQUIRED} pango pangocairo)
ENDIF(PANGO_MIN_VERSION) endif(PANGO_MIN_VERSION)
IF(NOT PANGO_FOUND AND NOT PKG_CONFIG_FOUND) if(NOT PANGO_FOUND AND NOT PKG_CONFIG_FOUND)
FIND_PATH(PANGO_INCLUDE_DIRS pango.h) find_path(PANGO_INCLUDE_DIRS pango.h)
FIND_LIBRARY(PANGO_LIBRARIES pango pangocairo) find_library(PANGO_LIBRARIES pango pangocairo)
else(NOT PANGO_FOUND AND NOT PKG_CONFIG_FOUND)
# Make paths absolute https://stackoverflow.com/a/35476270
# Important on FreeBSD because /usr/local/lib is not on /usr/bin/ld's default path
set(PANGO_LIBS_ABSOLUTE)
foreach(lib ${PANGO_LIBRARIES})
set(var_name PANGO_${lib}_ABS)
find_library(${var_name} ${lib} ${PANGO_LIBRARY_DIRS})
list(APPEND PANGO_LIBS_ABSOLUTE ${${var_name}})
endforeach()
set(PANGO_LIBRARIES ${PANGO_LIBS_ABSOLUTE})
endif(NOT PANGO_FOUND AND NOT PKG_CONFIG_FOUND)
# Report results include(FindPackageHandleStandardArgs)
IF(PANGO_LIBRARIES AND PANGO_INCLUDE_DIRS) find_package_handle_standard_args(PANGO DEFAULT_MSG PANGO_LIBRARIES PANGO_INCLUDE_DIRS)
SET(PANGO_FOUND 1) mark_as_advanced(PANGO_LIBRARIES PANGO_INCLUDE_DIRS)
IF(NOT Pango_FIND_QUIETLY)
MESSAGE(STATUS "Found Pango: ${PANGO_LIBRARIES}")
ENDIF(NOT Pango_FIND_QUIETLY)
ELSE(PANGO_LIBRARIES AND PANGO_INCLUDE_DIRS)
IF(Pango_FIND_REQUIRED)
MESSAGE(SEND_ERROR "Could not find Pango")
ELSE(Pango_FIND_REQUIRED)
IF(NOT Pango_FIND_QUIETLY)
MESSAGE(STATUS "Could not find Pango")
ENDIF(NOT Pango_FIND_QUIETLY)
ENDIF(Pango_FIND_REQUIRED)
ENDIF(PANGO_LIBRARIES AND PANGO_INCLUDE_DIRS)
ENDIF(NOT PANGO_FOUND AND NOT PKG_CONFIG_FOUND)
# Hide advanced variables from CMake GUIs
MARK_AS_ADVANCED(PANGO_LIBRARIES PANGO_INCLUDE_DIRS)

4
CMakeLists.txt
Unescape View File

@ -71,6 +71,10 @@ if(Backtrace_FOUND)
set(SWAY_Backtrace_HEADER "${Backtrace_HEADER}") set(SWAY_Backtrace_HEADER "${Backtrace_HEADER}")
endif() endif()
if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
find_package(EpollShim REQUIRED)
endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
include(FeatureSummary) include(FeatureSummary)
include(Manpage) include(Manpage)
include(GNUInstallDirs) include(GNUInstallDirs)

5
sway/CMakeLists.txt
Unescape View File

@ -55,9 +55,12 @@ target_link_libraries(sway
${PANGO_LIBRARIES} ${PANGO_LIBRARIES}
${JSONC_LIBRARIES} ${JSONC_LIBRARIES}
m m
cap
) )
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
target_link_libraries(sway cap)
endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
install( install(
TARGETS sway TARGETS sway
RUNTIME RUNTIME

5
sway/ipc-server.c
Unescape View File

@ -126,6 +126,8 @@ struct sockaddr_un *ipc_user_sockaddr(void) {
} }
static pid_t get_client_pid(int client_fd) { static pid_t get_client_pid(int client_fd) {
// FreeBSD supports getting uid/gid, but not pid
#ifdef __linux__
struct ucred ucred; struct ucred ucred;
socklen_t len = sizeof(struct ucred); socklen_t len = sizeof(struct ucred);
@ -134,6 +136,9 @@ static pid_t get_client_pid(int client_fd) {
} }
return ucred.pid; return ucred.pid;
#else
return -1;
#endif
} }
int ipc_handle_connection(int fd, uint32_t mask, void *data) { int ipc_handle_connection(int fd, uint32_t mask, void *data) {

2
sway/main.c
Unescape View File

@ -152,6 +152,7 @@ static void security_sanity_check() {
sway_log(L_ERROR, sway_log(L_ERROR,
"!! DANGER !! /proc is not available - sway CANNOT enforce security rules!"); "!! DANGER !! /proc is not available - sway CANNOT enforce security rules!");
} }
#ifdef __linux__
cap_flag_value_t v; cap_flag_value_t v;
cap_t cap = cap_get_proc(); cap_t cap = cap_get_proc();
if (!cap || cap_get_flag(cap, CAP_SYS_PTRACE, CAP_PERMITTED, &v) != 0 || v != CAP_SET) { if (!cap || cap_get_flag(cap, CAP_SYS_PTRACE, CAP_PERMITTED, &v) != 0 || v != CAP_SET) {
@ -161,6 +162,7 @@ static void security_sanity_check() {
if (cap) { if (cap) {
cap_free(cap); cap_free(cap);
} }
#endif
if (!stat(SYSCONFDIR "/sway", &s)) { if (!stat(SYSCONFDIR "/sway", &s)) {
if (s.st_uid != 0 || s.st_gid != 0 if (s.st_uid != 0 || s.st_gid != 0
|| (s.st_mode & S_IWGRP) || (s.st_mode & S_IWOTH)) { || (s.st_mode & S_IWGRP) || (s.st_mode & S_IWOTH)) {

4
sway/security.c
Unescape View File

@ -28,7 +28,11 @@ struct command_policy *alloc_command_policy(const char *command) {
} }
enum secure_feature get_feature_policy(pid_t pid) { enum secure_feature get_feature_policy(pid_t pid) {
#ifdef __FreeBSD__
const char *fmt = "/proc/%d/file";
#else
const char *fmt = "/proc/%d/exe"; const char *fmt = "/proc/%d/exe";
#endif
int pathlen = snprintf(NULL, 0, fmt, pid); int pathlen = snprintf(NULL, 0, fmt, pid);
char *path = malloc(pathlen + 1); char *path = malloc(pathlen + 1);
snprintf(path, pathlen + 1, fmt, pid); snprintf(path, pathlen + 1, fmt, pid);

4
swaymsg/CMakeLists.txt
Unescape View File

@ -2,6 +2,10 @@ add_executable(swaymsg
main.c main.c
) )
include_directories(
${JSONC_INCLUDE_DIRS}
)
target_link_libraries(swaymsg target_link_libraries(swaymsg
sway-common sway-common
${JSONC_LIBRARIES} ${JSONC_LIBRARIES}

2
wayland/CMakeLists.txt
Unescape View File

@ -3,6 +3,7 @@ include_directories(
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS} ${XKBCOMMON_INCLUDE_DIRS}
${WAYLAND_INCLUDE_DIR} ${WAYLAND_INCLUDE_DIR}
${EPOLLSHIM_INCLUDE_DIRS}
) )
add_library(sway-wayland STATIC add_library(sway-wayland STATIC
@ -18,6 +19,7 @@ target_link_libraries(sway-wayland
sway-protocols sway-protocols
${PANGO_LIBRARIES} ${PANGO_LIBRARIES}
${XKBCOMMON_LIBRARIES} ${XKBCOMMON_LIBRARIES}
${EPOLLSHIM_LIBRARIES}
) )
if (WITH_GDK_PIXBUF) if (WITH_GDK_PIXBUF)

Write Preview
Loading…
Cancel
Save