On 3/22/2017 8:30 AM, Nick Kew wrote:
[sorry, reposting by cut&paste from this morning when mail was broken]
On Sun, 2017-03-19 at 20:44 -0700, Gregg Smith wrote:
On Sun, 2017-03-19 at 20:44 -0700, Gregg Smith wrote:
> I've been hacking on the .mak and .win files.
> Had to add a -ossl1 to apr/build/cvtdsp.pl for the dsp file,
no other
> way around it that I have been able to figure out.
>
> I have apu building at the command line, with either openssl
1.0.2 or
> 1.1.0. IIRC 1.0.2 is a LTS version and is going to be around
for awhile
> still.
>
> Have comitted nothing at this point as I want to test a IDE
build. Not
> that we have ever been able to build the crypto modules from
the IDE
> without modifying the build manually/scripted.
Gregg, any thoughts on a timeframe for commit? Obviously
nice-to-have,
though I'm also thinking if we have to release without a fix, we
can
at least use Jan's latest post in a release note.
--
Nick Kew
I'll try to get the retro build stuff committed before bed tonight,
tomorrow latest.
I got a patch for cmake from Jan (attached) which ended up off list due
to the way "reply" works on this list.
Gregg
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 1787649)
+++ CMakeLists.txt (working copy)
@@ -238,7 +238,7 @@
SET(install_targets ${install_targets} libaprutil-1)
SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
-SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS
"APU_DECLARE_EXPORT;XML_STATIC;WINNT")
+SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS
"APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT")
ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
SET(install_targets ${install_targets} aprutil-1)
@@ -254,7 +254,7 @@
SET(install_bin_pdb ${install_bin_pdb}
${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES
"${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}")
SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS
"WINNT")
- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS
"-DDLL_NAME=apr_crypto_openssl")
+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS
"-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DAPR_DECLARE_EXPORT=1
-DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl")
TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES}
${OPENSSL_LIBRARIES})
ENDIF()
@@ -265,8 +265,8 @@
SET(dbd_drivers ${dbd_drivers} odbc)
TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32
odbccp32)
SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS
/export:apr_dbd_odbc_driver)
- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS
"APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT")
- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS
"-DDLL_NAME=apr_dbd_odbc")
+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS
"APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT")
+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS
"-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc")
ENDIF()
IF(APR_HAS_LDAP)
@@ -276,7 +276,7 @@
SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES}
${LDAP_LIBRARIES})
SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS
"-DDLL_NAME=apr_ldap")
+ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS
"-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap")
SET(apr_ldap_libraries apr_ldap-1)
ELSE()
SET(apr_ldap_libraries)
