mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-18 06:51:54 +00:00
Code Releases Activity

Move FreeBSD CFLAGS and LDFLAGS to configure

Browse Source 
Backport of commit 09c1e370b3.
This commit is contained in:
Ondrej Zajicek (work) 2018-07-28 15:50:30 +02:00
parent aa2ec912f5
commit 3140c8b2ca
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -211,9 +211,6 @@ docker_ubuntu-16_04-amd64:
# TODO We want to copy these BSDs to our own virtual machines, to make sure someone doesn't update them by accident. # TODO We want to copy these BSDs to our own virtual machines, to make sure someone doesn't update them by accident.
.freebsd-11-i386: &freebsd-11-i386_env .freebsd-11-i386: &freebsd-11-i386_env
variables:
CPPFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib"
tags: tags:
- freebsd - freebsd
- i386 - i386
@ -223,9 +220,6 @@ docker_ubuntu-16_04-amd64:
#- tags #- tags
.freebsd-11-amd64: &freebsd-11-amd64_env .freebsd-11-amd64: &freebsd-11-amd64_env
variables:
CPPFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib"
tags: tags:
- freebsd - freebsd
- amd64 - amd64

5
configure.ac
View File

@ -216,9 +216,13 @@ else
;; ;;
ipv6:freebsd*) ipv6:freebsd*)
sysdesc=bsd-v6 sysdesc=bsd-v6
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;; ;;
ipv4:freebsd*) ipv4:freebsd*)
sysdesc=bsd sysdesc=bsd
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;; ;;
ipv6:dragonfly*) ipv6:dragonfly*)
sysdesc=bsd-v6 sysdesc=bsd-v6
@ -419,4 +423,5 @@ AC_MSG_RESULT([ Debugging: $enable_debug])
AC_MSG_RESULT([ POSIX threads: $enable_pthreads]) AC_MSG_RESULT([ POSIX threads: $enable_pthreads])
AC_MSG_RESULT([ Routing protocols: $protocols]) AC_MSG_RESULT([ Routing protocols: $protocols])
AC_MSG_RESULT([ Client: $enable_client]) AC_MSG_RESULT([ Client: $enable_client])
rm -f $objdir/.*-stamp rm -f $objdir/.*-stamp