Browse Source

CMake: Remove "-no-pie" build option

libdecor/build/Makefile: unused anyway (previously used building demos)

src/CMakeLists.txt: broke some user builds, see fltk.general, thread
  "-no-pie in FLTK Libraries build." (Mar 17, 2024).

Todo: check usage of "-fPIC" (libdecor builds)
pull/948/head
Albrecht Schlosser 1 year ago
parent
commit
b53b2b6e11
  1. 6
      libdecor/build/Makefile
  2. 3
      src/CMakeLists.txt

6
libdecor/build/Makefile

@ -1,7 +1,7 @@
# #
# Library Makefile for the Fast Light Tool Kit (FLTK). # Library Makefile for the Fast Light Tool Kit (FLTK).
# #
# Copyright 2022-2023 by Bill Spitzak and others. # Copyright 2022-2024 by Bill Spitzak and others.
# #
# This library is free software. Distribution and use rights are outlined in # This library is free software. Distribution and use rights are outlined in
# the file "COPYING" which should have been included with this file. If this # the file "COPYING" which should have been included with this file. If this
@ -29,10 +29,6 @@ EXTRA_DECOR = ${${UNAME}_CFLAGS}
CFLAGS_DECOR = -I. -I../.. -I../../src -I../src -I../src/plugins $(EXTRA_DECOR) -fPIC -D_GNU_SOURCE \ CFLAGS_DECOR = -I. -I../.. -I../../src -I../src -I../src/plugins $(EXTRA_DECOR) -fPIC -D_GNU_SOURCE \
-DHAVE_MEMFD_CREATE -DHAVE_MKOSTEMP -DHAVE_POSIX_FALLOCATE -DHAVE_MEMFD_CREATE -DHAVE_MKOSTEMP -DHAVE_POSIX_FALLOCATE
Linux_NOPIE = -no-pie
FreeBSD_NOPIE =
NOPIE = ${${UNAME}_NOPIE}
all : $(OBJECTS) all : $(OBJECTS)
depend: depend:

3
src/CMakeLists.txt

@ -765,9 +765,6 @@ if(UNIX AND FLTK_BACKEND_WAYLAND)
if(DBUS_FOUND) if(DBUS_FOUND)
list(APPEND OPTIONAL_LIBS "${DBUS_LDFLAGS}") list(APPEND OPTIONAL_LIBS "${DBUS_LDFLAGS}")
endif(DBUS_FOUND) endif(DBUS_FOUND)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT FLTK_BUILD_SHARED_LIBS)
list(APPEND OPTIONAL_LIBS "-no-pie")
endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT FLTK_BUILD_SHARED_LIBS)
endif(UNIX AND FLTK_BACKEND_WAYLAND) endif(UNIX AND FLTK_BACKEND_WAYLAND)
####################################################################### #######################################################################

Loading…
Cancel
Save