Removed the "sky130_osu_sc" library as a configure target, since it
is not really a library but is used to create the t12, t15, and t18
libraries, which are already targets. Attempted to clean up some of
the mess with the OSU libraries and files being variously called,
e.g., "18t", "t18", and "18T". This has not been completely resolved
yet.
diff --git a/scripts/configure b/scripts/configure
index 8042b8a..4b226b2 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -591,7 +591,6 @@
SKY130_OSU_T18_PATH
SKY130_OSU_T15_PATH
SKY130_OSU_T12_PATH
-SKY130_OSU_PATH
SKY130_SRAM_MACROS_PATH
XSCHEM_SKY130_PATH
SKY130_ML_XX_HD_PATH
@@ -635,6 +634,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -669,7 +669,6 @@
enable_alpha_sky130
enable_xschem_sky130
enable_sram_sky130
-enable_osu_sky130
enable_osu_t12_sky130
enable_osu_t15_sky130
enable_osu_t18_sky130
@@ -717,6 +716,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -969,6 +969,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1106,7 +1115,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1259,6 +1268,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1329,9 +1339,6 @@
--enable-sram-sky130[=path]
Install sky130_sram_macros. If path is omitted, the repository
will be downloaded. [default=disabled]
- --enable-osu-sky130[=path]
- Install sky130_osu. If path is omitted, the repository
- will be downloaded. [default=disabled]
--enable-osu-t12-sky130[=path]
Install sky130_osu_t12. If path is omitted, the repository
will be downloaded. [default=disabled]
@@ -1831,7 +1838,7 @@
$as_echo_n "(cached) " >&6
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -1918,6 +1925,8 @@
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
+
+
PYTHON_PREFIX='${prefix}'
PYTHON_EXEC_PREFIX='${exec_prefix}'
@@ -2605,47 +2614,6 @@
# echo target targetvar flag location
- SKY130_OSU_PATH=""
-
- # Check whether --enable-osu-sky130 was given.
-if test "${enable_osu_sky130+set}" = set; then :
- enableval=$enable_osu_sky130;
- if test "$enableval" == "yes" -o "$enableval" == "YES"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Package 'sky130_osu' will be installed automatically during make." >&5
-$as_echo "$as_me: Package 'sky130_osu' will be installed automatically during make." >&6;}
- export SKY130_OSU_PATH=../sources/sky130_osu
- elif test "$enableval" == "no" -o "$enableval" == "NO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling package 'sky130_osu'" >&5
-$as_echo "$as_me: Disabling package 'sky130_osu'" >&6;}
- export SKY130_OSU_PATH=""
- else
- SKY130_OSU_PATH=$enableval
- { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling package 'sky130_osu' at $SKY130_OSU_PATH" >&5
-$as_echo "$as_me: Enabling package 'sky130_osu' at $SKY130_OSU_PATH" >&6;}
- fi
- SKY130_OSU_PATH=`realpath $SKY130_OSU_PATH`
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: Package 'sky130_osu' will not be installed." >&5
-$as_echo "$as_me: Package 'sky130_osu' will not be installed." >&6;}
-
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-
- # echo target targetvar flag location
-
SKY130_OSU_T12_PATH=""
# Check whether --enable-osu-t12-sky130 was given.
