rpms/alliance
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove bashisms in /etc/profile/alc_env.csh (RHBZ#1337691).

Browse source 
- Work around flex-2.6.0 compatibility issues triggering a FTBFS.
This commit is contained in:
Ralf Corsépius 2016-05-20 06:46:01 +02:00
commit f714dbb85a
3 changed files with 64 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
0011-Use-setenv-instead-of-set-RHBZ-1337691.patch Normal file
View file

@ -0,0 +1,27 @@
From 69c5281b9193149e3fa6d7fceac49de4eb57ab30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Fri, 20 May 2016 05:16:44 +0200
Subject: [PATCH 11/11] Use setenv instead of set (RHBZ#1337691)
---
alliance/src/distrib/etc/alc_env.csh.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/alliance/src/distrib/etc/alc_env.csh.in b/alliance/src/distrib/etc/alc_env.csh.in
index 4051fba..37c3b00 100644
--- a/alliance/src/distrib/etc/alc_env.csh.in
+++ b/alliance/src/distrib/etc/alc_env.csh.in
@@ -21,8 +21,8 @@
# Where the Alliance CAD is installed
setenv ALLIANCE_TOP "@prefix@"
- set SYSCONF_TOP "@sysconfdir@/alliance"
- set CELLS_TOP "@datadir@/alliance/cells"
+ setenv SYSCONF_TOP "@sysconfdir@/alliance"
+ setenv CELLS_TOP "@datadir@/alliance/cells"
# Alliance environment variables.
--
2.5.5

26
0012-Don-t-initialize-yylineno-with-flex-2.6.0.patch Normal file
View file

@ -0,0 +1,26 @@
From 685ad52e23f4a88e264cc47fdcb5b0c7d0596800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Fri, 20 May 2016 06:11:20 +0200
Subject: [PATCH 12/12] Don't initialize yylineno with flex >= 2.6.0
---
alliance/src/sea/src/DEF_grammar_lex.l | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/alliance/src/sea/src/DEF_grammar_lex.l b/alliance/src/sea/src/DEF_grammar_lex.l
index 752e2f8..be369d7 100644
--- a/alliance/src/sea/src/DEF_grammar_lex.l
+++ b/alliance/src/sea/src/DEF_grammar_lex.l
@@ -21,7 +21,8 @@
#define yylineno DEF_grammarlineno
-#ifndef FLEX_BETA
+#if !(defined(YY_FLEX_MAJOR_VERSION) && (YY_FLEX_MAJOR_VERSION >= 2) \
+ && defined(YY_FLEX_MINOR_VERSION) && (YY_FLEX_MINOR_VERSION >= 6))
int yylineno = 1;
#endif
--
2.5.5

12
alliance.spec
View file

@ -4,7 +4,7 @@
Name: alliance
Version: 5.1.1
Release: 4.%{snapdate}git%{shortcommit}%{?dist}
Release: 5.%{snapdate}git%{shortcommit}%{?dist}
Summary: VLSI EDA System
License: GPLv2
URL: https://soc-extras.lip6.fr/en/alliance-abstract-en/
@ -30,6 +30,10 @@ Patch17: 0007-Eliminate-CFLAGS.patch
Patch18: 0008-Rework-Makefile.ams.patch
Patch19: 0009-Misc.-doc-fixes.patch
Patch20: 0010-Fedora-profiles.patch
# Bashisms in /etc/profile.d/alc_env.csh
Patch21: 0011-Use-setenv-instead-of-set-RHBZ-1337691.patch
# Flex compatibility issues
Patch22: 0012-Don-t-initialize-yylineno-with-flex-2.6.0.patch
BuildRequires: bison
@ -126,6 +130,8 @@ Documentation and tutorials for the Alliance VLSI CAD Sytem.
%patch18 -p2
%patch19 -p2
%patch20 -p2
%patch21 -p2
%patch22 -p2
pushd src > /dev/null
@ -307,6 +313,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
%changelog
* Fri May 20 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-5.20160220git10a7b7e
- Remove bashisms in /etc/profile/alc_env.csh (RHBZ#1337691).
- Work around flex-2.6.0 compatibility issues triggering a FTBFS.
* Tue Mar 01 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-4.20160220git10a7b7e
- Rework spec.
- Add upstream changes.