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

[irods/irods#7286] Remove libarchive #267

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[irods/irods#7286] Remove libarchive #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 5 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
all : avro avro-libcxx boost boost-libcxx catch2 clang clang-runtime cmake cppzmq fmt fmt-libcxx json jsoncons jwt-cpp libarchive mungefs nanodbc nanodbc-libcxx qpid-proton qpid-proton-libcxx redis spdlog spdlog-libcxx zeromq4-1 zeromq4-1-libcxx
all : avro avro-libcxx boost boost-libcxx catch2 clang clang-runtime cmake cppzmq fmt fmt-libcxx json jsoncons jwt-cpp mungefs nanodbc nanodbc-libcxx qpid-proton qpid-proton-libcxx redis spdlog spdlog-libcxx zeromq4-1 zeromq4-1-libcxx


server-libstdcxx : avro boost catch2 clang cppzmq fmt json jsoncons libarchive nanodbc spdlog zeromq4-1
server-libstdcxx : avro boost catch2 clang cppzmq fmt json jsoncons nanodbc spdlog zeromq4-1

server-libcxx : avro-libcxx boost-libcxx catch2 clang clang-runtime cppzmq fmt-libcxx json jsoncons libarchive nanodbc-libcxx spdlog-libcxx zeromq4-1-libcxx
server-libcxx : avro-libcxx boost-libcxx catch2 clang clang-runtime cppzmq fmt-libcxx json jsoncons nanodbc-libcxx spdlog-libcxx zeromq4-1-libcxx

server : server-libstdcxx server-libcxx

Expand Down Expand Up @@ -115,15 +115,7 @@ jwt-cpp_clean :
@rm -rf jwt-cpp*
@rm -rf $(JWT-CPP_PACKAGE)

$(LIBARCHIVE_PACKAGE) : $(CMAKE_PACKAGE) $(CLANG_PACKAGE)
./build.py $(BUILD_OPTIONS) libarchive > libarchive.log 2>&1
libarchive : $(LIBARCHIVE_PACKAGE)
libarchive_clean :
@echo "Cleaning libarchive..."
@rm -rf libarchive*
@rm -rf $(LIBARCHIVE_PACKAGE)

$(MUNGEFS_PACKAGE) : $(CPPZMQ_PACKAGE) $(LIBARCHIVE_PACKAGE) $(AVRO_PACKAGE) $(CLANG-RUNTIME_PACKAGE) $(ZEROMQ4-1_PACKAGE)
$(MUNGEFS_PACKAGE) : $(CPPZMQ_PACKAGE) $(AVRO_PACKAGE) $(CLANG-RUNTIME_PACKAGE) $(ZEROMQ4-1_PACKAGE)
./build.py $(BUILD_OPTIONS) mungefs > mungefs.log 2>&1
mungefs : $(MUNGEFS_PACKAGE)
mungefs_clean :
Expand Down Expand Up @@ -183,7 +175,7 @@ zeromq4-1_clean :
@rm -rf zeromq4-1*
@rm -rf $(ZEROMQ4-1_PACKAGE) $(ZEROMQ4-1-LIBCXX_PACKAGE)

clean : avro_clean boost_clean catch2_clean clang_clean clang-runtime_clean cmake_clean cppzmq_clean fmt_clean json_clean jsoncons_clean jwt-cpp_clean libarchive_clean mungefs_clean nanodbc_clean qpid-proton_clean redis_clean spdlog_clean zeromq4-1_clean
clean : avro_clean boost_clean catch2_clean clang_clean clang-runtime_clean cmake_clean cppzmq_clean fmt_clean json_clean jsoncons_clean jwt-cpp_clean mungefs_clean nanodbc_clean qpid-proton_clean redis_clean spdlog_clean zeromq4-1_clean
@echo "Cleaning generated files..."
@rm -rf packages.mk
@echo "Done."
9 changes: 0 additions & 9 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,6 @@ def apply_patches():
log.debug('fmt_libcxx_root: [{0}]'.format(fmt_libcxx_root))
json_root = get_local_path('json',[])
log.debug('json_root: [{0}]'.format(json_root))
libarchive_root = get_local_path('libarchive',[])
log.debug('libarchive_root: [{0}]'.format(libarchive_root))

# build boost install path
boost_info = get_versions()['boost']
Expand Down Expand Up @@ -258,11 +256,6 @@ def apply_patches():
avro_libcxx_install_prefix = os.path.join(avro_libcxx_info['externals_root'], avro_libcxx_subdirectory)
avro_libcxx_rpath = os.path.join(avro_libcxx_install_prefix, 'lib')

libarchive_info = get_versions()['libarchive']
libarchive_subdirectory = '{0}{1}-{2}'.format('libarchive', libarchive_info['version_string'], libarchive_info['consortium_build_number'])
libarchive_install_prefix = os.path.join(libarchive_info['externals_root'], libarchive_subdirectory)
libarchive_rpath = os.path.join(libarchive_install_prefix, 'lib')

zmq_info = get_versions()['zeromq4-1']
zmq_subdirectory = '{0}{1}-{2}'.format('zeromq4-1', zmq_info['version_string'], zmq_info['consortium_build_number'])
zmq_install_prefix = os.path.join(zmq_info['externals_root'], zmq_subdirectory)
Expand Down Expand Up @@ -384,8 +377,6 @@ def apply_patches():
i = re.sub("TEMPLATE_BOOST_LIBCXX_ROOT", boost_libcxx_root, i)
i = re.sub("TEMPLATE_BOOST_RPATH", boost_rpath, i)
i = re.sub("TEMPLATE_BOOST_LIBCXX_RPATH", boost_libcxx_rpath, i)
i = re.sub("TEMPLATE_LIBARCHIVE_PATH", libarchive_root, i)
i = re.sub("TEMPLATE_LIBARCHIVE_RPATH", libarchive_rpath, i)
i = re.sub("TEMPLATE_AVRO_RPATH", avro_rpath, i)
i = re.sub("TEMPLATE_AVRO_PATH", avro_root, i)
i = re.sub("TEMPLATE_AVRO_LIBCXX_RPATH", avro_libcxx_rpath, i)
Expand Down
2 changes: 2 additions & 0 deletions install_prerequisites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def main():
'git',
'gpg',
'help2man',
'libarchive-dev',
'libbz2-dev',
'libcurl4-gnutls-dev',
'libfuse-dev',
Expand Down Expand Up @@ -132,6 +133,7 @@ def main():
'git',
'glibc-devel',
'help2man',
'libarchive-devel',
'libcurl-devel',
'libicu-devel',
'libmicrohttpd-devel',
Expand Down
55 changes: 0 additions & 55 deletions patches/libarchive/from-debian/lzip-large-dict.patch
View file
Open in desktop

This file was deleted.

175 changes: 0 additions & 175 deletions patches/libarchive/from-debian/typos.patch
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions patches/libarchive/from-debian/upstream-fix-32bit-size-cast.patch
View file
Open in desktop

This file was deleted.

Loading