--- c_gui/CASAManager.sh +++ c_gui/CASAManager.sh @@ -1,11 +1,9 @@ #!/bin/sh -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +# FIXME: incorrect, but keep for now +# mono-dlls do normally not live in lib64 +MY_MONO=`which mono` +ARCH_LIB=`ldd $MY_MONO | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` export MONO_PATH=/opt/novell/CASA/lib$ARCH_LIB/ mono /opt/novell/CASA/bin/CASAManager.exe & --- c_micasad/startup/micasad.sh +++ c_micasad/startup/micasad.sh @@ -1,11 +1,9 @@ #!/bin/sh -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +# FIXME: incorrect, but keep for now +# mono-dlls do normally not live in lib64 +MY_MONO=`which mono` +ARCH_LIB=`ldd $MY_MONO | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` export MONO_PATH=/opt/novell/CASA/lib$ARCH_LIB/ mono /opt/novell/CASA/bin/micasad.exe --- shsrc/lshsrc/mk-authkrb5token-dl +++ shsrc/lshsrc/mk-authkrb5token-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/auth_token/krb5_token/linux (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux$ARCH MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I\".\" -I\"../..\" -DSSCS_LINUX_PLAT_F -DDEBUG -g" $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-authkrb5token-ol +++ shsrc/lshsrc/mk-authkrb5token-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/auth_token/krb5_token/linux (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"../..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5) --- shsrc/lshsrc/mk-authtoken-dl +++ shsrc/lshsrc/mk-authtoken-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/auth_token/linux (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux$ARCH MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -DDEBUG -g" $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-authtoken-ol +++ shsrc/lshsrc/mk-authtoken-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/auth_token/linux (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5) --- shsrc/lshsrc/mk-clientlogin-dl +++ shsrc/lshsrc/mk-clientlogin-dl @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_clientlogin (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F" $2 $3 $4 $5) --- shsrc/lshsrc/mk-clientlogin-ol +++ shsrc/lshsrc/mk-clientlogin-ol @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_clientlogin (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall " $2 $3 $5) --- shsrc/lshsrc/mk-jmicasa-dl +++ shsrc/lshsrc/mk-jmicasa-dl @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_jwrapper/src --- shsrc/lshsrc/mk-jmicasa-ol +++ shsrc/lshsrc/mk-jmicasa-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_jwrapper/src ($JAVA_HOME/bin/javac com/novell/casa/MiCasa.java) --- shsrc/lshsrc/mk-loginpam-dl +++ shsrc/lshsrc/mk-loginpam-dl @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/login_capture/PAM --- shsrc/lshsrc/mk-loginpam-ol +++ shsrc/lshsrc/mk-loginpam-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/login_capture/PAM (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fno-strict-aliasing " $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasa-trayapp-dl +++ shsrc/lshsrc/mk-micasa-trayapp-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_trayapp (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=trayapp MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug -d:DEBUG -d:LINUX -nowarn:169" XTRA=dbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasa-trayapp-ol +++ shsrc/lshsrc/mk-micasa-trayapp-ol @@ -12,13 +12,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_trayapp (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=trayapp MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX -nowarn:169" XTRA=ndbg $2 $3) --- shsrc/lshsrc/mk-micasa_ad-dl +++ shsrc/lshsrc/mk-micasa_ad-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_adlib (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=adlib MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug -d:LINUX" XTRA=dbg $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasa_ad-ol +++ shsrc/lshsrc/mk-micasa_ad-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_adlib (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=adlib MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX" XTRA=ndbg $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasa_gk-dl +++ shsrc/lshsrc/mk-micasa_gk-dl @@ -12,12 +12,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig --- shsrc/lshsrc/mk-micasa_gk-ol +++ shsrc/lshsrc/mk-micasa_gk-ol @@ -12,12 +12,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig --- shsrc/lshsrc/mk-micasa_gkwrap-dl +++ shsrc/lshsrc/mk-micasa_gkwrap-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_adlib/ad_gk (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=gkwrap MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug" XTRA=dbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasa_gkwrap-ol +++ shsrc/lshsrc/mk-micasa_gkwrap-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_adlib/ad_gk (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=gkwrap MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="" XTRA=ndbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasa_kw-dl +++ shsrc/lshsrc/mk-micasa_kw-dl @@ -12,12 +12,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` #cd $PR/c_common #COMMON_FILES=$(ls) --- shsrc/lshsrc/mk-micasa_kw-ol +++ shsrc/lshsrc/mk-micasa_kw-ol @@ -12,12 +12,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` #cd $PR/c_common #COMMON_FILES=$(ls) --- shsrc/lshsrc/mk-micasa_kwwrap-dl +++ shsrc/lshsrc/mk-micasa_kwwrap-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_adlib/ad_kw (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=kwwrap MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug" XTRA=dbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasa_kwwrap-ol +++ shsrc/lshsrc/mk-micasa_kwwrap-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_adlib/ad_kw (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=kwwrap MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="" XTRA=ndbg $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasacache-dl +++ shsrc/lshsrc/mk-micasacache-dl @@ -11,14 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_micasacache (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=dbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DDEBUG -g -DSSCS_LINUX_PLAT_F" $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasacache-ol +++ shsrc/lshsrc/mk-micasacache-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_micasacache (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $5) --- shsrc/lshsrc/mk-micasacommon-dl +++ shsrc/lshsrc/mk-micasacommon-dl @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_micasad/lib (make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cscommonlib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug -d:LINUX" XTRA=dbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasacommon-ol +++ shsrc/lshsrc/mk-micasacommon-ol @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_micasad/lib (make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cscommonlib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX" XTRA=ndbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasaconsole-dl +++ shsrc/lshsrc/mk-micasaconsole-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_gui (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=casamanager MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug -d:DEBUG -d:LINUX -nowarn:169" XTRA=dbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasaconsole-ol +++ shsrc/lshsrc/mk-micasaconsole-ol @@ -12,13 +12,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_gui (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=casamanager MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS=" -d:LINUX -nowarn:169" XTRA=ndbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasad-dl +++ shsrc/lshsrc/mk-micasad-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_micasad (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=csssd MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug -d:DEBUG -d:LINUX -nowarn:169" XTRA=dbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasad-ol +++ shsrc/lshsrc/mk-micasad-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_micasad (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=csssd MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX -nowarn:169" XTRA=ndbg $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasadk-dl +++ shsrc/lshsrc/mk-micasadk-dl @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_common COMMON_FILES=$(ls) --- shsrc/lshsrc/mk-micasadk-ol +++ shsrc/lshsrc/mk-micasadk-ol @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_common --- shsrc/lshsrc/mk-micasapol-dl +++ shsrc/lshsrc/mk-micasapol-dl @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_policy (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=pollib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug" XTRA=dbg $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-micasapol-ol +++ shsrc/lshsrc/mk-micasapol-ol @@ -12,12 +12,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_policy (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=pollib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasawrap-dl +++ shsrc/lshsrc/mk-micasawrap-dl @@ -11,12 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_sharp/NSSCSWrapper (make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cslib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug" XTRA=dbg $2 $3 $4 $5) --- shsrc/lshsrc/mk-micasawrap-ol +++ shsrc/lshsrc/mk-micasawrap-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/c_sharp/NSSCSWrapper (make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cslib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg $2 $3 $4 $5) --- shsrc/lshsrc/mk-pamauthtoken-dl +++ shsrc/lshsrc/mk-pamauthtoken-dl @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/auth_token/PAM (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux$ARCH MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -DDEBUG -g" $2 $3 $4 $5 $6) --- shsrc/lshsrc/mk-pamauthtoken-ol +++ shsrc/lshsrc/mk-pamauthtoken-ol @@ -11,13 +11,7 @@ export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -HOST_ARCH=`uname -a | grep -c x86_64` -if [ $HOST_ARCH -gt 0 ] -then ARCH_LIB=64 -else -ARCH_LIB= -fi - +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"` cd $PR/auth_token/PAM (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)