summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJiaojinxing <jiaojinxing1987@gmail.com>2018-02-26 12:08:56 (GMT)
committer Jiaojinxing <jiaojinxing1987@gmail.com>2018-02-26 12:08:56 (GMT)
commit889b4e29495457cbb909397725ca00e494d0f058 (patch)
tree9ce9772185abcc4393681088762b4fb36d0ee1ee
parentbadce9b61369114c8edde368d719c034258c51c6 (diff)
downloadopenssl-889b4e29495457cbb909397725ca00e494d0f058.zip
openssl-889b4e29495457cbb909397725ca00e494d0f058.tar.gz
openssl-889b4e29495457cbb909397725ca00e494d0f058.tar.bz2
Modified ENGINESDIR and OPENSSLDIR path to "/usr/local/ssl".
-rw-r--r--.cproject11
-rw-r--r--.project2
-rw-r--r--.reproject18
-rw-r--r--openssl/include/openssl/opensslconf.h4
4 files changed, 30 insertions, 5 deletions
diff --git a/.cproject b/.cproject
index fc286b0..e4ae589 100644
--- a/.cproject
+++ b/.cproject
@@ -16,11 +16,22 @@
<pathentry kind="mac" name="__GNUC__" path="" value="4"/>
<pathentry kind="mac" name="SYLIXOS" path="" value=""/>
<pathentry kind="mac" name="__PPC__" path="" value=""/>
+ <pathentry kind="mac" name="MONOLITH" path="" value=""/>
+ <pathentry kind="mac" name="OPENSSL_PIC" path="" value=""/>
+ <pathentry kind="mac" name="OPENSSL_THREADS" path="" value=""/>
+ <pathentry kind="mac" name="_REENTRANT" path="" value=""/>
+ <pathentry kind="mac" name="DSO_DLFCN" path="" value=""/>
+ <pathentry kind="mac" name="HAVE_DLFCN_H" path="" value=""/>
+ <pathentry kind="mac" name="B_ENDIAN" path="" value=""/>
+ <pathentry kind="mac" name="B_ENDIAN" path="" value=""/>
+ <pathentry kind="mac" name="L_ENDIAN" path="" value=""/>
<pathentry base-ref="openssl" include="D:/SylixOSDev/workspace_ppc/sylixos-base-750/libsylixos/SylixOS" kind="inc" path="" system="true"/>
<pathentry base-ref="openssl" include="D:/SylixOSDev/workspace_ppc/sylixos-base-750/libsylixos/SylixOS/include" kind="inc" path="" system="true"/>
<pathentry base-ref="openssl" include="D:/SylixOSDev/workspace_ppc/sylixos-base-750/libsylixos/SylixOS/include/network" kind="inc" path="" system="true"/>
<pathentry base-ref="openssl" include="D:/SylixOSDev/workspace_ppc/sylixos-base-750/libcextern/libcextern/include" kind="inc" path="" system="true"/>
<pathentry base-ref="openssl" include="D:/ACOINFO/RealEvo/compiler/ppc-sylixos-toolchain/ppc-sylixos-eabi/include" kind="inc" path="" system="true"/>
<pathentry base-ref="openssl" include="D:/ACOINFO/RealEvo/compiler/ppc-sylixos-toolchain/lib/gcc/ppc-sylixos-eabi/4.9.3/include" kind="inc" path="" system="true"/>
+ <pathentry base-ref="openssl" include="openssl" kind="inc" path="" system="true"/>
+ <pathentry base-ref="openssl" include="openssl/include" kind="inc" path="" system="true"/>
</storageModule>
</cproject>
diff --git a/.project b/.project
index cb0f0b2..1c8ca4b 100644
--- a/.project
+++ b/.project
@@ -39,7 +39,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.build.target.inc</key>
- <value>all -j8</value>
+ <value>all</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
diff --git a/.reproject b/.reproject
index 9ad90a8..080c0b9 100644
--- a/.reproject
+++ b/.reproject
@@ -8,7 +8,21 @@
</OutputSetting>
<BuildSetting CoustomCfgMakefile="false" NeedReBuild="false" NotScanSourceFile="true"/>
<UploadPath>
-<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\openssl" value="/apps/openssl/openssl"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\openssl" value="/usr/bin/openssl"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libssl.so" value="/lib/libssl.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libcrypto.so" value="/lib/libcrypto.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\lib4758cca.so" value="/usr/lib/ssl/lib/engines/lib4758cca.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libaep.so" value="/usr/lib/ssl/lib/engines/libaep.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libatalla.so" value="/usr/lib/ssl/lib/engines/libatalla.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libcapi.so" value="/usr/lib/ssl/lib/engines/libcapi.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libchil.so" value="/usr/lib/ssl/lib/engines/libchil.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libcswift.so" value="/usr/lib/ssl/lib/engines/libcswift.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libgmp.so" value="/usr/lib/ssl/lib/engines/libgmp.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libnuron.so" value="/usr/lib/ssl/lib/engines/libnuron.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libpadlock.so" value="/usr/lib/ssl/lib/engines/libpadlock.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libsureware.so" value="/usr/lib/ssl/lib/engines/libsureware.so"/>
+<PairItem key="$(WORKSPACE_openssl)\$(Output)\strip\libubsec.so" value="/usr/lib/ssl/lib/engines/libubsec.so"/>
+<PairItem key="$(WORKSPACE_openssl)/openssl\apps\openssl.cnf" value="/usr/lib/ssl/openssl.cnf"/>
</UploadPath>
-<DeviceSetting DevName="" WorkDir="/apps/openssl"/>
+<DeviceSetting DevName="192.168.7.34" WorkDir="/apps/openssl"/>
</SylixOSSetting>
diff --git a/openssl/include/openssl/opensslconf.h b/openssl/include/openssl/opensslconf.h
index 6e01b18..168d8a2 100644
--- a/openssl/include/openssl/opensslconf.h
+++ b/openssl/include/openssl/opensslconf.h
@@ -119,8 +119,8 @@ extern "C" {
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/local/ssl/lib/engines"
-#define OPENSSLDIR "/usr/local/ssl"
+#define ENGINESDIR "/usr/lib/ssl/lib/engines"
+#define OPENSSLDIR "/usr/lib/ssl"
#endif
#endif