Skip to content

Commit

Permalink
Merge pull request #106 from ggtakec/update/change_pkgs
Browse files Browse the repository at this point in the history
Changed directories created by packages
  • Loading branch information
ggtakec authored Oct 22, 2024
2 parents a9d5c25 + 86d7589 commit 974d917
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 42 deletions.
4 changes: 3 additions & 1 deletion buildutils/APKBUILD.templ.in
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ url="https://k2hash.antpick.ax/"
arch="x86_64"
license="MIT"

depends=""
depends="
libfullock
"
depends_dev="
libfullock-dev
"
Expand Down
3 changes: 1 addition & 2 deletions buildutils/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ EXTRA_DIST =make_variables.sh \
make_description.sh \
debian_build.sh \
rpm_build.sh \
alpine_build.sh \
k2hash.postinst
alpine_build.sh

#
# Local variables:
Expand Down
35 changes: 0 additions & 35 deletions buildutils/k2hash.postinst

This file was deleted.

2 changes: 0 additions & 2 deletions buildutils/k2hash.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ BuildRequires: git-core gcc-c++ make libtool libfullock-devel >= @LIB_MINVER_LIB
%install
%make_install
find %{buildroot} -name '*.la' -exec rm -f {} ';'
mkdir -p %{buildroot}/var/lib/antpickax

%if %{make_check}
%check
Expand Down Expand Up @@ -103,7 +102,6 @@ rm -rf %{buildroot}
%{_libdir}/*.so.1*
%{_mandir}/man1/*
%{_bindir}/*
%dir %attr(0777,root,root) /var/lib/antpickax

#
# devel package
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ AM_CONDITIONAL([IS_OPENSSL3], [test "$is_openssl3" = yes])
#
# Version list for Libraries
#
AC_SUBST([LIB_MINVER_LIBFULLOCK], "1.0.60")
AC_SUBST([LIB_MINVER_LIBFULLOCK], "1.0.61")

#
# Checking Libraries
Expand All @@ -303,7 +303,7 @@ AC_ARG_ENABLE(check-depend-libs,
esac]
)
AS_IF([test ${check_depend_libs} = 1], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.60], [], [AC_MSG_ERROR(not found libfullock package)])])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.61], [], [AC_MSG_ERROR(not found libfullock package)])])

#
# CFLAGS/CXXFLAGS
Expand Down

0 comments on commit 974d917

Please sign in to comment.