Skip to content

C
core
Kaydet (Commit) 50f90f79 authored tarafından sb's avatar sb
Dosyalara gözat
Seçenekler

sb119: merged in DEV300_m69

üst 06b1cfd6 35c909bf
Hide whitespace changes
Inline Side-by-side
Showing with 374 additions and 88 deletions
berkeleydb/makefile.mk
Dosyayı görüntüle @ 50f90f79
...@@ -110,13 +110,7 @@ CXXFLAGS+:=$(ARCH_FLAGS) ...@@ -110,13 +110,7 @@ CXXFLAGS+:=$(ARCH_FLAGS)
BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR=$(CONFIGURE_DIR)
BUILD_DIR_OUT=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR)
.IF "$(OS)"=="IRIX"
CONFIGURE_ACTION= $(CONFIG_SHELL) ..$/dist$/configure
BUILD_ACTION=gmake
.ELSE
BUILD_ACTION=make BUILD_ACTION=make
.ENDIF
OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
OUT2INC= \ OUT2INC= \
......
curl/makefile.mk
Dosyayı görüntüle @ 50f90f79
...@@ -74,11 +74,7 @@ CONFIGURE_ACTION=.$/configure ...@@ -74,11 +74,7 @@ CONFIGURE_ACTION=.$/configure
CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)"
BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_DIR=$(CONFIGURE_DIR)$/lib
.IF "$(OS)"=="IRIX"
BUILD_ACTION=gmake
.ELSE
BUILD_ACTION=$(GNUMAKE) BUILD_ACTION=$(GNUMAKE)
.ENDIF
BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_FLAGS+= -j$(EXTMAXPROCESS)
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).3 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).3
......
moz/extractfiles.mk
Dosyayı görüntüle @ 50f90f79
...@@ -67,7 +67,7 @@ NSS_MODULE_RUNTIME_LIST:= \ ...@@ -67,7 +67,7 @@ NSS_MODULE_RUNTIME_LIST:= \
plds4 \ plds4 \
smime3 \ smime3 \
softokn3 \ softokn3 \
sqlite3 \ sqlite/sqlite3 \
ssl3 ssl3
BIN_RUNTIMELIST= \ BIN_RUNTIMELIST= \
...@@ -307,8 +307,8 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip ...@@ -307,8 +307,8 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip
echo >& $(NULLDEV) echo >& $(NULLDEV)
.IF "$(ENABLE_NSS_MODULE)" == "YES" .IF "$(ENABLE_NSS_MODULE)" == "YES"
# We add the libraries from the separate nss module # We add the libraries from the separate nss module
$(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARLIBDIR)$/$(DLLPRE)$(file)$(DLLPOST) \ $(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARLIBDIR)$/$(file:d:d)/$(DLLPRE)$(file:f)$(DLLPOST) \
$(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \ $(RUNTIME_DIR)$/$(DLLPRE)$(file:f)$(DLLPOST) &&) \
echo >& $(NULLDEV) echo >& $(NULLDEV)
.ENDIF .ENDIF
.ELSE # .IF "$(GUI)" == "UNX" .ELSE # .IF "$(GUI)" == "UNX"
......
moz/zipped/makefile.mk
Dosyayı görüntüle @ 50f90f79
...@@ -175,6 +175,8 @@ FREEBL=freebl3 ...@@ -175,6 +175,8 @@ FREEBL=freebl3
.ENDIF # "$(OS)" == "SOLARIS" .ENDIF # "$(OS)" == "SOLARIS"
#On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so
#See readme.txt in module nss
NSS_MODULE_RUNTIME_LIST:= \ NSS_MODULE_RUNTIME_LIST:= \
$(FREEBL) \ $(FREEBL) \
nspr4 \ nspr4 \
...@@ -186,7 +188,7 @@ NSS_MODULE_RUNTIME_LIST:= \ ...@@ -186,7 +188,7 @@ NSS_MODULE_RUNTIME_LIST:= \
plds4 \ plds4 \
smime3 \ smime3 \
softokn3 \ softokn3 \
sqlite3 \ sqlite/sqlite3 \
ssl3 ssl3
...@@ -200,13 +202,13 @@ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip ...@@ -200,13 +202,13 @@ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
echo >& $(NULLDEV) echo >& $(NULLDEV)
$(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \ $(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \
echo >& $(NULLDEV) echo >& $(NULLDEV)
$(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib)$(DLLPOST) &&) \ $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib:f)$(DLLPOST) &&) \
echo >& $(NULLDEV) echo >& $(NULLDEV)
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \ +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib:f)$(DLLPOST) &&) \
echo >& $(NULLDEV) echo >& $(NULLDEV)
.ELSE .ELSE
$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \ +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(lib:d)$(DLLPRE)$(lib:f)$(DLLPOST) &&) \
echo >& $(NULLDEV) echo >& $(NULLDEV)
.ENDIF .ENDIF
$(TOUCH) $@ $(TOUCH) $@
......
nss/makefile.mk
Dosyayı görüntüle @ 50f90f79
...@@ -49,6 +49,10 @@ TARFILE_NAME=nss_3_12_5 ...@@ -49,6 +49,10 @@ TARFILE_NAME=nss_3_12_5
TARFILE_ROOTDIR=mozilla TARFILE_ROOTDIR=mozilla
PATCH_FILES=nss.patch PATCH_FILES=nss.patch
.IF "$(OS)"=="MACOSX"
PATCH_FILES+=nss_macosx.patch
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(debug)" != "" .IF "$(debug)" != ""
.ELSE .ELSE
BUILD_OPT=1 BUILD_OPT=1
...@@ -64,13 +68,21 @@ USE_64:=1 ...@@ -64,13 +68,21 @@ USE_64:=1
.ENDIF # "$(CPU)"=="X" .ENDIF # "$(CPU)"=="X"
.ENDIF # "$(OS)$(COM)"=="LINUXGCC" .ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="FREEBSDGCC"
.IF "$(CPU)"=="X"
# force 64-bit buildmode
USE_64:=1
.EXPORT : USE_64
.ENDIF # "$(CPU)"=="X"
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(EXTRA_CFLAGS)"!="" .IF "$(EXTRA_CFLAGS)"!=""
CPP:=gcc -E $(EXTRA_CFLAGS) CPP:=gcc -E $(EXTRA_CFLAGS)
CXX:=g++ $(EXTRA_CFLAGS) CXX:=g++ $(EXTRA_CFLAGS)
CC:=gcc $(EXTRA_CFLAGS) CC:=gcc $(EXTRA_CFLAGS)
.EXPORT : CPP MACOS_SDK_DIR*=$(MACDEVSDK)
.EXPORT : CPP MACOS_SDK_DIR
.ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(EXTRA_CFLAGS)"!=""
.ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(OS)"=="MACOSX"
......
nss/nss.patch
Dosyayı görüntüle @ 50f90f79
...@@ -169,3 +169,24 @@ ...@@ -169,3 +169,24 @@
endif endif
endif endif
endif endif
--- misc/mozilla/security/nss/cmd/shlibsign/Makefile Fri Aug 7 21:06:37 2009
+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile Fri Nov 27 13:07:52 2009
@@ -78,10 +78,15 @@
# sign any and all shared libraries that contain the word freebl
-CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
-CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
+# Signing causes loading of some system library which in turn loads
+# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper
+# version. Therefore signing fails.
+# We cannot build with the system sqlite3, because it is too old (SDK
+# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib.
+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
ifndef NSS_DISABLE_DBM
-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
endif
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
nss/nss_macosx.patch 0 → 100644
Dosyayı görüntüle @ 50f90f79
--- misc/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
+++ misc/build/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
@@ -104,6 +104,9 @@
ifeq ($(OS_TARGET),WIN95)
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
endif
+ifdef MACOS_SDK_DIR
+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
+endif
ifdef USE_DEBUG_RTL
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
nss/prj/d.lst
Dosyayı görüntüle @ 50f90f79
mkdir: %_DEST%\inc%_EXT%\mozilla\nspr mkdir: %_DEST%\inc%_EXT%\mozilla\nspr
mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\obsolete mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\obsolete
mkdir: %_DEST%\inc%_EXT%\mozilla\nss mkdir: %_DEST%\inc%_EXT%\mozilla\nss
mkdir: %_DEST%\lib%_EXT%\sqlite
..\%__SRC%\inc\include\* %_DEST%\inc%_EXT%\mozilla\nspr ..\%__SRC%\inc\include\* %_DEST%\inc%_EXT%\mozilla\nspr
..\%__SRC%\inc\include\obsolete\protypes.h %_DEST%\inc%_EXT%\mozilla\nspr\obsolete\protypes.h ..\%__SRC%\inc\include\obsolete\protypes.h %_DEST%\inc%_EXT%\mozilla\nspr\obsolete\protypes.h
..\%__SRC%\inc\nss\*.h %_DEST%\inc%_EXT%\mozilla\nss ..\%__SRC%\inc\nss\*.h %_DEST%\inc%_EXT%\mozilla\nss
..\%__SRC%\lib\* %_DEST%\lib%_EXT%
..\%__SRC%\lib\libfreebl3.* %_DEST%\lib%_EXT%\libfreebl.*
..\%__SRC%\lib\libfreebl_32fpu_3.* %_DEST%\lib%_EXT%\libfreebl_32fpu_3.*
..\%__SRC%\lib\libfreebl_32int64_3.* %_DEST%\lib%_EXT%\libfreebl_32int64_3.*
..\%__SRC%\lib\libfreebl_32int_3.* %_DEST%\lib%_EXT%\libfreebl_32int_3.*
..\%__SRC%\lib\libfreebl_64int_3.* %_DEST%\lib%_EXT%\libfreebl_64int_3.*
..\%__SRC%\lib\libfreebl_64fpu_3.* %_DEST%\lib%_EXT%\libfreebl_64fpu_3.*
..\%__SRC%\lib\libnspr4.* %_DEST%\lib%_EXT%\libnspr4.*
..\%__SRC%\lib\libnss3.* %_DEST%\lib%_EXT%\libnss3.*
..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%\libnssckbi.*
..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%\libnssdbm3.*
..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%\libnssutil3.*
..\%__SRC%\lib\libplc4.* %_DEST%\lib%_EXT%\libplc4.*
..\%__SRC%\lib\libplds4.* %_DEST%\lib%_EXT%\libplds4.*
..\%__SRC%\lib\libsmime3.* %_DEST%\lib%_EXT%\libsmime3.*
..\%__SRC%\lib\libsoftokn3.* %_DEST%\lib%_EXT%\libsoftokn3.*
..\%__SRC%\lib\libssl3.* %_DEST%\lib%_EXT%\libssl3.*
..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite\libsqlite3.*
..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
..\%__SRC%\bin\* %_DEST%\bin%_EXT% ..\%__SRC%\bin\* %_DEST%\bin%_EXT%
nss/readme.txt
Dosyayı görüntüle @ 50f90f79
Relation between nss, moz, moz_prebuilt Relation between nss, moz, moz_prebuilt
--------------------------------------- ---------------------------------------
nss containes the security libraries which are also part of moz. However nss is nss containes the security libraries which are also part of moz. However nss is
meant to be more current, that is it to be updated more often. This should be meant to be more current, that is it to be updated more often. This should be
easier than doing this with moz. easier than doing this with moz.
If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which
is per default set to YES. In this case nss is build before moz. The nss is per default set to YES. In this case nss is build before moz. The nss
libraries/lib files/headers built in moz are then not delivered. Otherwise they libraries/lib files/headers built in moz are then not delivered. Otherwise they
would overwrite those from nss. That is, the nss libraries build in moz are would overwrite those from nss. That is, the nss libraries build in moz are
removed from mozruntime.zip (build in moz/solver/bin), they are removed from the removed from mozruntime.zip (build in moz/solver/bin), they are removed from the
lib directory (for example moz/unxlngi6.pro/lib), and the nss and nspr headers lib directory (for example moz/unxlngi6.pro/lib), and the nss and nspr headers
are also removed (inc/nss and inc/nspr). The nss libraries from the nss module are also removed (inc/nss and inc/nspr). The nss libraries from the nss module
are then added to mozruntime.zip. are then added to mozruntime.zip.
This also applies for moz_prebuilt. Therefore moz and moz_prebuilt must be build This also applies for moz_prebuilt. Therefore moz and moz_prebuilt must be build
again after changes have been made to the libraries in the nss module. again after changes have been made to the libraries in the nss module.
Also when moz was updated to use a newer version of mozilla, then one must make Also when moz was updated to use a newer version of mozilla, then one must make
sure that new files which also belong to nss are not delivered and are removed sure that new files which also belong to nss are not delivered and are removed
from mozruntime.zip. from mozruntime.zip.
Fips 140 and signed libraries Fips 140 and signed libraries
------------------------------- -------------------------------
Fips 140 mode is not supported. That is, the *.chk files containing the Fips 140 mode is not supported. That is, the *.chk files containing the
checksums for the cryptographic module are not delivered into solver and will checksums for the cryptographic module are not delivered into solver and will
not be part of the OOo installation sets. not be part of the OOo installation sets.
The *chk files do not match the libraries because we change the rpatch. Signing has been turned off because
- we change the rpath (install names) after signing which breaks the signatures
libfreebl3 (Mac)
---------- - sqlite conflicts with the system sqlite when signing which breaks the build
Porting to other platforms may require to deliver other variants of
libfreebl*. The library name varies according to the platform. Changes need to
be made to libfreebl3
ooo/moz/extractfiles.mk ----------
ooo/moz/zipped/makefile.mk Porting to other platforms may require to deliver other variants of
sun/moz_prebuilt/zipped/makefile.mk libfreebl*. The library name varies according to the platform. Changes need to
be made to
ooo/moz/extractfiles.mk
See also ooo/moz/zipped/makefile.mk
http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html sun/moz_prebuilt/zipped/makefile.mk
See also
Windows builds of nss http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
---------------------
To build mozilla on windows you'll need the mozilla build tools
Windows builds of nss
Build requirements containing the link to the build tools: ---------------------
https://developer.mozilla.org/en/Windows_Build_Prerequisites#ss2.2 To build mozilla on windows you'll need the mozilla build tools
The direct link: Build requirements containing the link to the build tools:
https://developer.mozilla.org/en/Windows_Build_Prerequisites#ss2.2
http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.3.exe
The direct link:
http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.3.exe
libsqlite3
----------
The problem described here was found on Mac with OS 10.6
NSS cannot use the system sqlite on Mac because the base line is still MacOS
10.4. That system sqlite is incompatible with the softokn3 in nss which requires
a later version of sqlite.
When we used a more current Mac SDK then we could set
NSS_USE_SYSTEM_SQLITE=1
to build using the system sqlite.
We cannot deliver sqlite in the lib directory of the solver. This directory is
used by tools of the build environment. Using the sqlite from NSS breaks the
tools if they use system libraries which are linked with the system
sqlite. Therefore we deliver it into lib/sqlite on unix systems.
See also issue
http://qa.openoffice.org/issues/show_bug.cgi?id=106132
python/Python-2.6.1.patch
Dosyayı görüntüle @ 50f90f79
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
+# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} +# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
+# EndProjectSection +# EndProjectSection
+#EndProject +#EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
+# ProjectSection(ProjectDependencies) = postProject + ProjectSection(ProjectDependencies) = postProject
+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
+# {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} + {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}
+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+# EndProjectSection + EndProjectSection
+#EndProject +EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
......
python/Python-ssl.patch 0 → 100644
Dosyayı görüntüle @ 50f90f79
--- misc/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:24:35.140625000 +0000
+++ misc/build/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:25:11.750000000 +0000
@@ -255,4 +255,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
--- misc/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000
+++ misc/build/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000
@@ -43,7 +43,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -57,7 +57,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -106,7 +106,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -120,7 +120,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -169,7 +169,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -183,7 +183,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -233,7 +233,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -247,7 +247,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -296,7 +296,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -310,7 +310,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -360,7 +360,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -374,7 +374,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
TargetMachine="17"
/>
<Tool
@@ -424,7 +424,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -438,7 +438,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -488,7 +488,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -502,7 +502,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
TargetMachine="17"
/>
<Tool
--- misc/Python-2.6.1/setup.py 2009-11-02 10:12:43.000000000 +0000
+++ misc/build/Python-2.6.1/setup.py 2009-11-02 10:18:19.000000000 +0000
@@ -612,7 +612,15 @@
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
+ UPDMINOR = os.environ.get('UPDMINOREXT')
+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
+ os.environ.get('INPATH') + '/' + \
+ 'inc'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/external/'
search_for_ssl_incs_in = [
+ ooosslinc,
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
@@ -624,8 +632,15 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
+ ooossllib = os.environ.get('SOLARVER') + '/' + \
+ os.environ.get('INPATH') + '/' + \
+ 'lib'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/'
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib',
+ [ooossllib,
+ '/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
--- misc/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:16:50.000000000 +0000
+++ misc/build/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:17:49.000000000 +0000
@@ -248,14 +248,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
-#_md5 md5module.c md5.c
+_md5 md5module.c md5.c
# The _sha module implements the SHA checksum algorithms.
# (NIST's Secure Hash Algorithms.)
-#_sha shamodule.c
-#_sha256 sha256module.c
-#_sha512 sha512module.c
+_sha shamodule.c
+_sha256 sha256module.c
+_sha512 sha512module.c
# SGI IRIX specific modules -- off by default.
python/makefile.mk
Dosyayı görüntüle @ 50f90f79
...@@ -50,7 +50,9 @@ all: ...@@ -50,7 +50,9 @@ all:
TARFILE_NAME=Python-$(PYVERSION) TARFILE_NAME=Python-$(PYVERSION)
PATCH_FILES=Python-$(PYVERSION).patch PATCH_FILES=\
Python-$(PYVERSION).patch \
Python-ssl.patch
CONFIGURE_DIR= CONFIGURE_DIR=
...@@ -80,11 +82,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-in ...@@ -80,11 +82,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-in
.IF "$(OS)$(CPU)" == "SOLARISI" .IF "$(OS)$(CPU)" == "SOLARISI"
CONFIGURE_ACTION += --disable-ipv6 CONFIGURE_ACTION += --disable-ipv6
.ENDIF .ENDIF
.IF "$(OS)" == "IRIX"
BUILD_ACTION=$(ENV_BUILD) gmake -j$(EXTMAXPROCESS) ; gmake install
.ELSE
BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; chmod -R ug+w $(MYCWD)/python-inst BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; chmod -R ug+w $(MYCWD)/python-inst
.ENDIF
.ELSE .ELSE
# ---------------------------------- # ----------------------------------
# WINDOWS # WINDOWS
......
python/prj/build.lst
Dosyayı görüntüle @ 50f90f79
py python : SO:so_prereq solenv NULL py python : SO:so_prereq solenv OPENSSL:openssl NULL
py python nmake - w,vc7 py_mkout NULL py python nmake - w,vc7 py_mkout NULL
py python nmake - u py_mkout NULL py python nmake - u py_mkout NULL
python/prj/d.lst
Dosyayı görüntüle @ 50f90f79
...@@ -94,6 +94,7 @@ symlink: %_DEST%\lib%_EXT%\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so ...@@ -94,6 +94,7 @@ symlink: %_DEST%\lib%_EXT%\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so
..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.dll %_DEST%\bin%_EXT%\python26.dll ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.dll %_DEST%\bin%_EXT%\python26.dll
..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.lib %_DEST%\lib%_EXT%\python26.lib ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.lib %_DEST%\lib%_EXT%\python26.lib
..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
..\%__SRC%\misc\build\Python-2.6.1\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
..\%__SRC%\misc\build\Python-2.6.1\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
..\%__SRC%\misc\build\Python-2.6.1\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment