Skip to content

Allow building from tarball without Python #257

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

Merged
rockdaboot merged 1 commit into from
Nov 21, 2025
Merged

Allow building from tarball without Python #257

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
5 changes: 4 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ AC_ARG_ENABLE([man],
AM_CONDITIONAL(ENABLE_MAN, test x$enable_man = xyes)

# src/psl-make-dafsa needs python 2.7+
AM_PATH_PYTHON([2.7])
AS_IF([! test -f src/suffixes_dafsa.h -a -f tests/psl.dafsa -a -f tests/psl_ascii.dafsa],
[
AM_PATH_PYTHON([2.7],, [AC_MSG_ERROR([python 2.7+ is required to convert the PSL data])])
])

PKG_PROG_PKG_CONFIG

Expand Down
7 changes: 4 additions & 3 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ include libpsl-srcs.mk
# suffixes.c must be created before psl.c is compiled
BUILT_SOURCES = suffixes_dafsa.h

# suffixes.c is a built source that must be cleaned
CLEANFILES = suffixes_dafsa.h
# suffixes.c is a built source that a normal clean should not touch.
# Because building it is expensive and requires python to be installed.
MAINTAINERCLEANFILES = suffixes_dafsa.h

lib_LTLIBRARIES = libpsl.la

Expand All @@ -23,6 +24,6 @@ suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa

bin_SCRIPTS = psl-make-dafsa

EXTRA_DIST = psl-make-dafsa LICENSE.chromium meson.build
EXTRA_DIST = psl-make-dafsa LICENSE.chromium meson.build suffixes_dafsa.h

dist_man_MANS = psl-make-dafsa.1
10 changes: 5 additions & 5 deletions tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ DEFS = @DEFS@ \
-DSRCDIR=\"$(srcdir)\" \
-DPSL_FILE=\"$(PSL_FILE)\" \
-DPSL_TESTFILE=\"$(PSL_TESTFILE)\" \
-DPSL_DAFSA=\"psl.dafsa\" \
-DPSL_ASCII_DAFSA=\"psl_ascii.dafsa\"
-DPSL_DAFSA=\"$(srcdir)/psl.dafsa\" \
-DPSL_ASCII_DAFSA=\"$(srcdir)/psl_ascii.dafsa\"
AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = ../src/libpsl.la
AM_LDFLAGS = -no-install
Expand Down Expand Up @@ -37,7 +37,7 @@ psl.dafsa: $(PSL_FILE)
psl_ascii.dafsa: $(PSL_FILE)
$(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa

clean-local:
rm -f psl.dafsa psl_ascii.dafsa
MAINTAINERCLEANFILES = psl.dafsa psl_ascii.dafsa

EXTRA_DIST = meson.build
# Add the dafsa files because building them is expensive and requires python to be installed.
EXTRA_DIST = meson.build psl.dafsa psl_ascii.dafsa
6 changes: 3 additions & 3 deletions tests/test-is-public-all.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,16 @@ static void test_psl(void)
printf("builtin PSL has %d suffixes and %d exceptions\n", psl_suffix_count(psl2), psl_suffix_exception_count(psl2));

if (!(psl3 = psl_load_file(PSL_DAFSA))) {
fprintf(stderr, "Failed to load 'psl.dafsa'\n");
fprintf(stderr, "Failed to load '%s'\n", PSL_DAFSA);
failed++;
}

if (!(psl4 = psl_load_file(PSL_ASCII_DAFSA))) {
fprintf(stderr, "Failed to load 'psl_ascii.dafsa'\n");
fprintf(stderr, "Failed to load '%s'\n", PSL_ASCII_DAFSA);
failed++;
}

psl5 = psl_latest("psl.dafsa");
psl5 = psl_latest(PSL_DAFSA);

if ((fp = fopen(PSL_FILE, "r"))) {
#ifdef HAVE_CLOCK_GETTIME
Expand Down
Loading