diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /net-misc/apt-cacher-ng/files | |
parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) |
gentoo resync : 18.11.2019
Diffstat (limited to 'net-misc/apt-cacher-ng/files')
-rw-r--r-- | net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch | 75 | ||||
-rw-r--r-- | net-misc/apt-cacher-ng/files/confd-r1 | 3 | ||||
-rw-r--r-- | net-misc/apt-cacher-ng/files/initd | 32 | ||||
-rw-r--r-- | net-misc/apt-cacher-ng/files/initd-r2 | 34 |
4 files changed, 112 insertions, 32 deletions
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch new file mode 100644 index 000000000000..a2f43a4d3789 --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch @@ -0,0 +1,75 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ + + set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) +-#set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever ++set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever + + INCLUDE(CheckIncludeFiles) + INCLUDE(CheckCXXSourceCompiles) +@@ -27,7 +27,7 @@ + INCLUDE(GNUInstallDirs) + + IF(NOT DEFINED(CMAKE_INSTALL_PREFIX)) +-set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space") ++#_cmake_modify_IGNORE set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space") + ENDIF() + IF(NOT DEFINED(LIBDIR)) + set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}" CACHE STRING "Location of ${PACKAGE} extra files") +@@ -94,23 +94,6 @@ + _append(ACNG_CXXFLAGS -fvisibility-inlines-hidden) + endif() + +-foreach(linkarg -Wl,--as-needed -Wl,-O1 -Wl,--discard-all -Wl,--no-undefined -Wl,--build-id=sha1 -Wl,-fuse-ld=gold) +- STRING(REGEX REPLACE "=|-|," "" optname "${linkarg}") +- set(CMAKE_REQUIRED_FLAGS "${linkarg}") +- CHECK_CXX_COMPILER_FLAG("" "LD_${optname}") +- if(LD_${optname}) +- _append(CMAKE_EXE_LINKER_FLAGS ${linkarg}) +- endif() +- set(CMAKE_REQUIRED_FLAGS "") +-endforeach(linkarg) +- +-set(CMAKE_REQUIRED_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads") +-CHECK_CXX_COMPILER_FLAG("" LD_MULTITHREADED) +-if(LD_MULTITHREADED) +- _append(CMAKE_EXE_LINKER_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads") +-endif() +-set(CMAKE_REQUIRED_FLAGS "") +- + option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality" on) + + IF(CMAKE_SYSTEM MATCHES "Darwin") +@@ -132,15 +115,6 @@ + if(CMAKE_BUILD_TYPE MATCHES Debug) + set(USE_LTO_DEFAULT off) + _append(ACNG_COMPFLAGS -DDEBUG) +-else() +- set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections") +- CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS) +- if(GC_SECTIONS) +- _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections) +- _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections) +- _append(CMAKE_SHARED_LINKER_FLAGS -Wl,--gc-sections) +- endif() +- set(CMAKE_REQUIRED_FLAGS "") + endif() + + option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT}) +@@ -385,3 +359,14 @@ + LIBDIR: ${LIBDIR} + AVAHIDIR: ${AVAHIDIR} + ") ++ ++MESSAGE(STATUS "<<< Gentoo configuration >>> ++Build type ${CMAKE_BUILD_TYPE} ++Install path ${CMAKE_INSTALL_PREFIX} ++Compiler flags: ++C ${CMAKE_C_FLAGS} ++C++ ${CMAKE_CXX_FLAGS} ++Linker flags: ++Executable ${CMAKE_EXE_LINKER_FLAGS} ++Module ${CMAKE_MODULE_LINKER_FLAGS} ++Shared ${CMAKE_SHARED_LINKER_FLAGS}\n") diff --git a/net-misc/apt-cacher-ng/files/confd-r1 b/net-misc/apt-cacher-ng/files/confd-r1 new file mode 100644 index 000000000000..84b659bc488b --- /dev/null +++ b/net-misc/apt-cacher-ng/files/confd-r1 @@ -0,0 +1,3 @@ +# Additional options that are passed to the Daemon. +DAEMON_OPTS=" -c /etc/apt-cacher-ng " +LOGDIR="" diff --git a/net-misc/apt-cacher-ng/files/initd b/net-misc/apt-cacher-ng/files/initd deleted file mode 100644 index d054b4de76bd..000000000000 --- a/net-misc/apt-cacher-ng/files/initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -NAME="apt-cacher-ng" -DAEMON="/usr/sbin/$NAME" -RUNDIR="/var/run/$NAME" -PIDFILE="$RUNDIR/$NAME.pid" -SOCKETFILE="$RUNDIR/$NAME.socket" -DAEMON_OPTS="$DAEMON_OPTS pidfile=$PIDFILE SocketPath=$SOCKETFILE foreground=0" - -depend() { - use net -} - -start() { - ebegin "Starting $NAME" - checkpath -d -m 0755 -o ${NAME}:${NAME} ${RUNDIR} - start-stop-daemon --start --exec $DAEMON \ - --user $NAME --group $NAME \ - --pidfile $PIDFILE \ - -- $DAEMON_OPTS - eend $? -} - -stop() { - ebegin "Stopping $NAME" - start-stop-daemon --stop --retry 15 --exec $DAEMON \ - --pidfile $PIDFILE - rm -f $PIDFILE - eend $? -} diff --git a/net-misc/apt-cacher-ng/files/initd-r2 b/net-misc/apt-cacher-ng/files/initd-r2 new file mode 100644 index 000000000000..ae9ab7258cc4 --- /dev/null +++ b/net-misc/apt-cacher-ng/files/initd-r2 @@ -0,0 +1,34 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +CACHEDIR="var/cache/${RC_SVCNAME}" +DAEMON="/usr/sbin/${RC_SVCNAME}" +RUNDIR="/var/run/${RC_SVCNAME}" +PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid" +SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket" +DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0" + +depend() { + use net +} + +start() { + ebegin "Starting ${RC_SVCNAME}" + checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}" + checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}" + [ -z "${LOGDIR}" ] && checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "/var/log/${RC_SVCNAME}" + start-stop-daemon --start --exec ${DAEMON} \ + --user ${RC_SVCNAME} --group ${RC_SVCNAME} \ + --pidfile ${PIDFILE} \ + -- ${DAEMON_OPTS} + eend $? +} + +stop() { + ebegin "Stopping ${RC_SVCNAME}" + start-stop-daemon --stop --retry 15 --exec ${DAEMON} \ + --pidfile ${PIDFILE} + rm -f ${PIDFILE} + eend $? +} |