rpm/texlive
SHA256
1
0
Fork 0
forked from pool/texlive
Code Pull Requests Activity

Avoid error on older compiler on Leap 42.3

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=323
This commit is contained in:
Dr. Werner Fink 2019-05-31 12:31:34 +00:00 committed by Git OBS Bridge
parent 14d855c7d7
commit 6fdc103597
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
texlive.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 31 12:29:26 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Avoid error on older compiler aswel as older glm on Leap 42.3
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 29 06:37:37 UTC 2019 - Dr. Werner Fink <werner@suse.de> Wed May 29 06:37:37 UTC 2019 - Dr. Werner Fink <werner@suse.de>

11
texlive.spec
View File

@ -3551,6 +3551,7 @@ This package is required by the package texlive-biber-bin.
cflags -Wl,--hash-size=8599 XLDFLAGS cflags -Wl,--hash-size=8599 XLDFLAGS
cflags -Wl,-warn-common XLDFLAGS cflags -Wl,-warn-common XLDFLAGS
cflags -Wl,-Bsymbolic-functions XLDFLAGS cflags -Wl,-Bsymbolic-functions XLDFLAGS
XCXXFLAGS="${XCXXFLAGS/-Wno-unprototyped-calls/}"
HOST=%{_target_cpu}-suse-%{_host_os} HOST=%{_target_cpu}-suse-%{_host_os}
BUILD=%{_target_cpu}-suse-%{_build_os} BUILD=%{_target_cpu}-suse-%{_build_os}
BINARY=${CPU}-${OS} BINARY=${CPU}-${OS}
@ -3855,14 +3856,24 @@ fi
/* GNU ld script */ /* GNU ld script */
INPUT(%{_libdir}/libOSMesa.so AS_NEEDED(-lglapi)) INPUT(%{_libdir}/libOSMesa.so AS_NEEDED(-lglapi))
EOF EOF
%if 0%{?suse_version} <= 1350
sed -ri '/^namespace camp \{/{ s/$/ using glm::value_ptr;/; }' glrender.cc
%endif
PATH=$prefix/bin:$PATH \ PATH=$prefix/bin:$PATH \
TEXMFLOCAL=%{_texmfmaindir} \ TEXMFLOCAL=%{_texmfmaindir} \
TEXMFCNF=$texmfcnf \ TEXMFCNF=$texmfcnf \
STRIP=/bin/true \ STRIP=/bin/true \
STRIPPROG=/bin/true \ STRIPPROG=/bin/true \
LDFLAGS="$LDFLAGS -L$PWD" \ 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/}" \ CFLAGS="${CFLAGS/-std=gnu99/}" \
CXXFLAGS="${CXXFLAGS/-std=gnu99/}" \ CXXFLAGS="${CXXFLAGS/-std=gnu99/}" \
%endif
./configure \ ./configure \
--host=${HOST} \ --host=${HOST} \
--build=${BUILD} \ --build=${BUILD} \