Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[apr-util] Fix incorrect codes in apu.h #27456

Merged
merged 8 commits into from
Oct 26, 2022
Merged

[apr-util] Fix incorrect codes in apu.h #27456

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
387a6e6
[apr-util] Fix incorrect header file
LilyWangLL Oct 25, 2022
d36483f
x-add-version
LilyWangLL Oct 25, 2022
e6ae707
fix deprecated function and remove unused option
LilyWangLL Oct 26, 2022
30099fd
x-add-version
LilyWangLL Oct 26, 2022
dd048e0
format
LilyWangLL Oct 26, 2022
4749cbd
x-add-version
LilyWangLL Oct 26, 2022
677dc68
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Oct 26, 2022
88475a5
* Add comment explaining how APU_DECLARE_STATIC embedding works.
BillyONeal Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions ports/apr-util/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,17 @@ vcpkg_download_distfile(ARCHIVE
)

if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
use-vcpkg-expat.patch
apr.patch
unglue.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(APU_DECLARE_EXPORT ON)
set(APU_DECLARE_STATIC OFF)
else()
set(APU_DECLARE_EXPORT OFF)
set(APU_DECLARE_STATIC ON)
endif()

vcpkg_cmake_configure(
Comment on lines 16 to 17
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked that this removal is OK because the upstream CMakeLists.txt already had this effect:

# libaprutil-1 is shared, aprutil-1 is static
if(BUILD_SHARED_LIBS)
ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
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;APR_DECLARE_IMPORT;XML_STATIC;WINNT")

else(BUILD_SHARED_LIBS)
ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
SET(install_targets ${install_targets} aprutil-1)
TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC")
endif(BUILD_SHARED_LIBS)

SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DAPU_DECLARE_EXPORT=${APU_DECLARE_EXPORT}
-DAPU_DECLARE_STATIC=${APU_DECLARE_STATIC}
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)
Expand All @@ -37,15 +26,15 @@ if(VCPKG_TARGET_IS_WINDOWS)

file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h APU_H)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
string(REPLACE "defined(APU_DECLARE_EXPORT)" "1" APU_H "${APU_H}")
string(REPLACE "defined(APU_DECLARE_STATIC)" "0" APU_H "${APU_H}")
else()
string(REPLACE "defined(APU_DECLARE_STATIC)" "1" APU_H "${APU_H}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}")

else()
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE ${ARCHIVE}
)

Expand Down
2 changes: 1 addition & 1 deletion ports/apr-util/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "apr-util",
"version": "1.6.1",
"port-version": 8,
"port-version": 9,
"description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
"homepage": "https://apr.apache.org/",
"license": "Apache-2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/apr-util.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "70320666a21b98f34683445c6f568a745edaa913",
"version": "1.6.1",
"port-version": 9
},
{
"git-tree": "e11acd0b01edac0a064893b89bd9eb2d976f4371",
"version": "1.6.1",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
},
"apr-util": {
"baseline": "1.6.1",
"port-version": 8
"port-version": 9
},
"apsi": {
"baseline": "0.8.2",
Expand Down