Skip to content

Commit

Permalink
More progress on issue #124 FreeBSD.
Browse files Browse the repository at this point in the history
  • Loading branch information
ahlstromcj committed Dec 20, 2023
1 parent 8da1af2 commit a991a35
Show file tree
Hide file tree
Showing 11 changed files with 485 additions and 24 deletions.
2 changes: 2 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ FreeBSD:
gmake. Also had to edit the generated libtool script to change
the version from 2.4.7 to 2.4.6 to fool the build. The command needed to
configure was the following, including the command to make the code.
Also need to figure out why a "stopped" message appears in the
root generated Makefile, which breaks the build.

$ ./configure --with-alsa-prefix=/usr/local/lib
--with-alsa-inc-prefix=/usr/local/include
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -21932,7 +21932,7 @@ else
CFLAGS="$CFLAGS $COMMONFLAGS"
fi

CXXFLAGS="$CFLAGS -std=gnu++1y -pipe -Wno-variadic-macros -Wno-deprecated-declarations"
CXXFLAGS="$CFLAGS -std=c++14 -pipe -Wno-variadic-macros -Wno-deprecated-declarations"
LDFLAGS="$LDFLAGS $PROLDFLAGS"

if test "$ac_gnuwin" = "yes"; then
Expand Down
10 changes: 6 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dnl \file configure.ac
dnl \library Seq66
dnl \author Chris Ahlstrom
dnl \date 2018-11-09
dnl \update 2023-12-18
dnl \update 2023-12-20
dnl \version $Revision$
dnl \license $XPC_SUITE_GPL_LICENSE$
dnl
Expand Down Expand Up @@ -534,7 +534,7 @@ dnl automatically for us.

AH_TOP(

#define VERSION_DATE_SHORT "2023-12-18"
#define VERSION_DATE_SHORT "2023-12-20"
#define API_VERSION "0.99"
#define VERSION "0.99.12"

Expand Down Expand Up @@ -607,16 +607,18 @@ esac
dnl Note the c++14 option. Also note that PROLDFLAGS comes from xpc_debug.m4.
dnl Trying out gnu++14 or gnu++1y (they don't work) instead, to see if we can
dnl eliminate the problem of debug linkage on some of our laptops.
dnl The warning disablig for clang does not prevent "clang-16: warning:
dnl The warning disabling for clang does not prevent "clang-16: warning:
dnl optimization flag '-fno-fat-lto-objects' is not supported".
dnl Finally, after getting an std::sort() error in the triggers class under
dnl clang-16.0.6, we will force C++14.

if test "$ac_clang_active" = "yes" ; then
CFLAGS="$CFLAGS $COMMONFLAGS -Wignored-optimization-argument"
else
CFLAGS="$CFLAGS $COMMONFLAGS"
fi

CXXFLAGS="$CFLAGS -std=gnu++1y -pipe -Wno-variadic-macros -Wno-deprecated-declarations"
CXXFLAGS="$CFLAGS -std=c++14 -pipe -Wno-variadic-macros -Wno-deprecated-declarations"
LDFLAGS="$LDFLAGS $PROLDFLAGS"

AM_CONDITIONAL(GNU_WIN, test "$ac_gnuwin" = "yes")
Expand Down
Loading

0 comments on commit a991a35

Please sign in to comment.