From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 27 Oct 2024 08:34:51 +0000 (+0000)
Subject: build: Simplify check for libtool archives and static libraries
X-Git-Tag: 0.9.30~800
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6338196eaec8c0bee5da4970f6d84a50de8c4974;p=pakfire.git

build: Simplify check for libtool archives and static libraries

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index f796b0bd0..5f9e2c524 100644
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -1131,7 +1131,7 @@ static int __pakfire_build_remove_static_libraries(
 	int r;
 
 	// Find all static libraries
-	if (pakfire_file_matches_class(file, PAKFIRE_FILE_STATIC_LIBRARY)) {
+	if (pakfire_file_matches(file, "**.a")) {
 		// Copy the filename
 		r = pakfire_string_set(path, pakfire_file_get_abspath(file));
 		if (r)
@@ -1163,7 +1163,7 @@ static int __pakfire_build_remove_libtool_archives(
 	struct pakfire_filelist* removees = (struct pakfire_filelist*)data;
 
 	// Find all libtool archive files
-	if (pakfire_file_matches_class(file, PAKFIRE_FILE_LIBTOOL_ARCHIVE))
+	if (pakfire_file_matches(file, "**.la"))
 		return pakfire_filelist_add(removees, file);
 
 	return 0;
diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c
index bd92039f4..8e003c6cb 100644
--- a/src/libpakfire/file.c
+++ b/src/libpakfire/file.c
@@ -1349,8 +1349,6 @@ static const struct pattern {
 	const char* pattern;
 	int class;
 } patterns[] = {
-	{ "**.a",  PAKFIRE_FILE_STATIC_LIBRARY },
-	{ "**.la", PAKFIRE_FILE_LIBTOOL_ARCHIVE },
 	{ "**.pm", PAKFIRE_FILE_PERL },
 	{ NULL },
 };
diff --git a/src/libpakfire/include/pakfire/file.h b/src/libpakfire/include/pakfire/file.h
index 9d23fbc52..9be4649ce 100644
--- a/src/libpakfire/include/pakfire/file.h
+++ b/src/libpakfire/include/pakfire/file.h
@@ -124,8 +124,6 @@ enum pakfire_file_classes {
 
 	// The rest
 	PAKFIRE_FILE_PERL            = (1 << 10),
-	PAKFIRE_FILE_STATIC_LIBRARY  = (1 << 11),
-	PAKFIRE_FILE_LIBTOOL_ARCHIVE = (1 << 12),
 };
 
 int pakfire_file_is_executable(struct pakfire_file* file);