On Wed, Apr 11, 2018 at 01:48:29PM +0200, Jeremie Courreges-Anglas wrote: > On Wed, Apr 11 2018, Giovanni Bechis <giova...@openbsd.org> wrote: > > On 04/11/18 05:16, Matthew Martin wrote: > >> On Tue, Apr 10, 2018 at 04:44:56PM +0200, Giovanni Bechis wrote: > >>> test.log run on 6.3 attached, does it differs from yours ? > >>> Cheers > >>> Giovanni > >> > >> Not meaningfully. Thanks for the log. > >> > >> - Matthew Martin > >> > > Ok for me if it still works then. > > I cannot commit nor switch to clang6 before next week. > > I would gladly commit it, but as-is the diff would break non-clang > platforms. Maybe an ifdef check would be enough.
How about this then? Just tell clang to compile as c++03. - Matthew Martin diff --git Makefile Makefile index 78a8c328b25..b1135d6771e 100644 --- Makefile +++ Makefile @@ -3,7 +3,7 @@ COMMENT = software able to hide data in various kind of files DISTNAME = steghide-0.5.1 -REVISION = 4 +REVISION = 5 CATEGORIES = security HOMEPAGE = http://steghide.sf.net/ @@ -20,9 +20,14 @@ LIB_DEPENDS = devel/gettext \ security/mhash \ graphics/jpeg WANTLIB = c iconv intl jpeg m mhash mcrypt ${COMPILER_LIBCXX} z -CONFIGURE_STYLE = gnu +CONFIGURE_STYLE = autoconf +AUTOCONF_VERSION = 2.57 CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl" +.include <bsd.port.arch.mk> +.if ${PROPERTIES:Mclang} +CONFIGURE_ENV += CXXFLAGS=-std=c++03 +.endif .include <bsd.port.mk> diff --git patches/patch-configure_in patches/patch-configure_in new file mode 100644 index 00000000000..b68f1db01ee --- /dev/null +++ patches/patch-configure_in @@ -0,0 +1,23 @@ +$OpenBSD$ + +Index: configure.in +--- configure.in.orig ++++ configure.in +@@ -22,14 +22,14 @@ AC_ARG_ENABLE(debug,[ --enable-debug enable + then + AC_MSG_RESULT([yes]) + AC_DEFINE(DEBUG,1,[enable code used only for debugging]) +- CXXFLAGS="-O2 -Wall -g" ++ CXXFLAGS="$CXXFLAGS -O2 -Wall -g" + else + AC_MSG_RESULT([no]) +- CXXFLAGS="-O2 -Wall" ++ CXXFLAGS="$CXXFLAGS -O2 -Wall" + fi + , + AC_MSG_RESULT([no]) +- CXXFLAGS="-O2 -Wall" ++ CXXFLAGS="$CXXFLAGS -O2 -Wall" + ) + + dnl check if randomness should be disabled
