diff --git a/texlive.changes b/texlive.changes index a874c21..259f53b 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 31 12:29:26 UTC 2019 - Dr. Werner Fink + +- Avoid error on older compiler aswel as older glm on Leap 42.3 + ------------------------------------------------------------------- Wed May 29 06:37:37 UTC 2019 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index 1ea7911..bdc4f94 100644 --- a/texlive.spec +++ b/texlive.spec @@ -3551,6 +3551,7 @@ This package is required by the package texlive-biber-bin. cflags -Wl,--hash-size=8599 XLDFLAGS cflags -Wl,-warn-common XLDFLAGS cflags -Wl,-Bsymbolic-functions XLDFLAGS + XCXXFLAGS="${XCXXFLAGS/-Wno-unprototyped-calls/}" HOST=%{_target_cpu}-suse-%{_host_os} BUILD=%{_target_cpu}-suse-%{_build_os} BINARY=${CPU}-${OS} @@ -3855,14 +3856,24 @@ fi /* GNU ld script */ INPUT(%{_libdir}/libOSMesa.so AS_NEEDED(-lglapi)) EOF +%if 0%{?suse_version} <= 1350 + sed -ri '/^namespace camp \{/{ s/$/ using glm::value_ptr;/; }' glrender.cc +%endif PATH=$prefix/bin:$PATH \ TEXMFLOCAL=%{_texmfmaindir} \ TEXMFCNF=$texmfcnf \ STRIP=/bin/true \ STRIPPROG=/bin/true \ LDFLAGS="$LDFLAGS -L$PWD" \ + CFLAGS="${CFLAGS/-Wno-unprototyped-calls/}" \ + CXXFLAGS="${CXXFLAGS/-Wno-unprototyped-calls/}" \ +%if 0%{?suse_version} <= 1350 + CFLAGS="${CFLAGS/-std=gnu99/-std=gnu++11} -DGLM_FORCE_RADIANS" \ + CXXFLAGS="${CXXFLAGS/-std=gnu99/-std=gnu++11} -DGLM_FORCE_RADIANS" \ +%else CFLAGS="${CFLAGS/-std=gnu99/}" \ CXXFLAGS="${CXXFLAGS/-std=gnu99/}" \ +%endif ./configure \ --host=${HOST} \ --build=${BUILD} \