mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

238319: Sun packages changes. 

Install 64 bit libraries in lib64 on Linux.
This commit is contained in:
christophe.ravel.bugs%sun.com 2005-09-08 22:23:54 +00:00
Родитель 815eaa43da
Коммит 982861b69c
3 изменённых файлов: 26 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
nsprpub/pkg/linux/Makefile.in
Просмотреть файл

@ -38,7 +38,7 @@
#
# ***** END LICENSE BLOCK *****
#
#ident "$Id: Makefile.in,v 1.6 2005-07-22 15:32:39 christophe.ravel.bugs%sun.com Exp $"
#ident "$Id: Makefile.in,v 1.7 2005-09-08 22:23:52 christophe.ravel.bugs%sun.com Exp $"
#
MOD_DEPTH = ../..
@ -59,13 +59,16 @@ include $(MOD_DEPTH)/config/autoconf.mk
# Force i386 for non 64 bit build
ifneq ($(USE_64),1)
RPMTARGET = "--target=i386"
RPMLIBDIR = lib
else
RPMLIBDIR = lib64
endif
publish:
$(MAKE) clean
mkdir -p SOURCES SRPMS RPMS BUILD
(cd $(dist_libdir) && tar cphf - .) \
| (mkdir -p opt/sun/private/lib && cd opt/sun/private/lib && tar xvfBp -)
| (mkdir -p opt/sun/private/$(RPMLIBDIR) && cd opt/sun/private/$(RPMLIBDIR) && tar xvfBp -)
(cd $(dist_includedir) && tar cphf - .) \
| (mkdir -p opt/sun/private/include/nspr && cd opt/sun/private/include/nspr && tar xvfBp -)
tar czvf SOURCES/$(NAME)-$(VERSION).tar.gz opt

14
security/jss/pkg/linux/Makefile
Просмотреть файл

@ -38,7 +38,7 @@
#
# ***** END LICENSE BLOCK *****
#
#ident "$Id: Makefile,v 1.18 2005-07-22 15:32:49 christophe.ravel.bugs%sun.com Exp $"
#ident "$Id: Makefile,v 1.19 2005-09-08 22:23:53 christophe.ravel.bugs%sun.com Exp $"
#
CORE_DEPTH = ../../..
@ -55,17 +55,21 @@ include $(CORE_DEPTH)/coreconf/config.mk
# Force i386 for non 64 bit build
ifneq ($(USE_64),1)
RPMTARGET = "--target=i386"
RPMLIBDIR = lib
else
RPMLIBDIR = lib64
endif
publish:
$(MAKE) clean
mkdir -p SOURCES SRPMS RPMS BUILD
mkdir -p opt/sun/private/lib
mkdir -p opt/sun/private/$(RPMLIBDIR)
find $(CORE_DEPTH)/../dist/$(OBJDIR)/lib -type l \
\( -name "*jss*.so" \) \
-exec cp {} opt/sun/private/lib \;
-exec cp {} opt/sun/private/$(RPMLIBDIR) \;
ifdef JSS3_LOCATION
cp $(JSS3_LOCATION)/$(OBJDIR)/lib/libjss3.so opt/sun/private/lib
cp $(JSS3_LOCATION)/$(OBJDIR)/lib/libjss3.so opt/sun/private/$(RPMLIBDIR)
endif
mkdir -p opt/sun/private/share/lib
ifeq ($(BUILD_OPT), 1)
@ -94,7 +98,7 @@ endif
echo "%dir /opt" >>temp.spec
echo "%dir /opt/sun" >>temp.spec
echo "%dir /opt/sun/private" >>temp.spec
echo "%dir /opt/sun/private/lib" >>temp.spec
echo "%dir /opt/sun/private/$(RPMLIBDIR)" >>temp.spec
echo "%dir /opt/sun/private/share" >>temp.spec
echo "%dir /opt/sun/private/share/lib" >>temp.spec
find opt \( -name "*.so" -o -name "*.jar" \) \

20
security/nss/pkg/linux/Makefile
Просмотреть файл

@ -38,7 +38,7 @@
#
# ***** END LICENSE BLOCK *****
#
#ident "$Id: Makefile,v 1.12 2005-07-22 15:32:50 christophe.ravel.bugs%sun.com Exp $"
#ident "$Id: Makefile,v 1.13 2005-09-08 22:23:54 christophe.ravel.bugs%sun.com Exp $"
#
CORE_DEPTH = ../../..
@ -55,19 +55,23 @@ include $(CORE_DEPTH)/coreconf/config.mk
# Force i386 for non 64 bit build
ifneq ($(USE_64),1)
RPMTARGET = "--target=i386"
RPMLIBDIR = lib
else
RPMLIBDIR = lib64
endif
publish:
$(MAKE) clean
mkdir -p SOURCES SRPMS RPMS BUILD
mkdir -p opt/sun/private/lib
mkdir -p opt/sun/private/$(RPMLIBDIR)
find $(CORE_DEPTH)/../dist/$(OBJDIR)/lib -type l \
\( -name "*.so" -o -name "*.chk" \) \
-exec cp {} opt/sun/private/lib \;
rm -f opt/sun/private/lib/libnspr4.so \
opt/sun/private/lib/libplc4.so \
opt/sun/private/lib/libplds4.so \
opt/sun/private/lib/libjss*.so
-exec cp {} opt/sun/private/$(RPMLIBDIR) \;
rm -f opt/sun/private/$(RPMLIBDIR)/libnspr4.so \
opt/sun/private/$(RPMLIBDIR)/libplc4.so \
opt/sun/private/$(RPMLIBDIR)/libplds4.so \
opt/sun/private/$(RPMLIBDIR)/libjss*.so
mkdir -p opt/sun/private/bin
(cd $(CORE_DEPTH)/../dist/$(OBJDIR)/bin && tar cphf - \
certutil cmsutil crlutil modutil pk12util signtool \
@ -89,7 +93,7 @@ publish:
echo "%dir /opt" >>temp.spec
echo "%dir /opt/sun" >>temp.spec
echo "%dir /opt/sun/private" >>temp.spec
echo "%dir /opt/sun/private/lib" >>temp.spec
echo "%dir /opt/sun/private/$(RPMLIBDIR)" >>temp.spec
echo "%dir /opt/sun/private/bin" >>temp.spec
find opt \( -name "*.so" -o -name "*.chk" -o -type f \
-perm u=rwx,g=rx,o=rx \) | sed -e "s-^-/-" >>temp.spec