From b9be46fb3115dffcd5cdaa62523bd025c7342e42 Mon Sep 17 00:00:00 2001
From: Qyriad <qyriad@qyriad.me>
Date: Tue, 7 May 2024 13:34:36 -0600
Subject: remove the autoconf+Make buildsystem

We're not using it anymore. Any leftover bugs in the Meson buildsystem
are now just bugs.

Closes #249.

Change-Id: I0465a0c37ae819f94d40e7829f5bff046aa63d73
---
 perl/Makefile           | 21 ---------------------
 perl/Makefile.config.in | 18 ------------------
 perl/default.nix        | 41 ++++++++++-------------------------------
 perl/local.mk           | 43 -------------------------------------------
 4 files changed, 10 insertions(+), 113 deletions(-)
 delete mode 100644 perl/Makefile
 delete mode 100644 perl/Makefile.config.in
 delete mode 100644 perl/local.mk

(limited to 'perl')

diff --git a/perl/Makefile b/perl/Makefile
deleted file mode 100644
index 832668dd1..000000000
--- a/perl/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-makefiles = local.mk
-
-GLOBAL_CXXFLAGS += -g -Wall -std=c++2a
-
-# A convenience for concurrent development of Nix and its Perl bindings.
-# Not needed in a standalone build of the Perl bindings.
-ifneq ("$(wildcard ../src)", "")
-  GLOBAL_CXXFLAGS += -I ../src
-endif
-
--include Makefile.config
-
-OPTIMIZE = 1
-
-ifeq ($(OPTIMIZE), 1)
-  GLOBAL_CXXFLAGS += -O3
-else
-  GLOBAL_CXXFLAGS += -O0
-endif
-
-include mk/lib.mk
diff --git a/perl/Makefile.config.in b/perl/Makefile.config.in
deleted file mode 100644
index d856de3ad..000000000
--- a/perl/Makefile.config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-HOST_OS = @host_os@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-SODIUM_LIBS = @SODIUM_LIBS@
-NIX_CFLAGS = @NIX_CFLAGS@
-NIX_LIBS = @NIX_LIBS@
-nixbindir = @nixbindir@
-curl = @curl@
-nixlibexecdir = @nixlibexecdir@
-nixlocalstatedir = @nixlocalstatedir@
-perl = @perl@
-perllibdir = @perllibdir@
-nixstoredir = @nixstoredir@
-nixsysconfdir = @nixsysconfdir@
diff --git a/perl/default.nix b/perl/default.nix
index af700eabe..7ce418402 100644
--- a/perl/default.nix
+++ b/perl/default.nix
@@ -4,8 +4,6 @@
   stdenv,
   perl,
   perlPackages,
-  autoconf-archive,
-  autoreconfHook,
   pkg-config,
   nix,
   curl,
@@ -16,7 +14,6 @@
   darwin,
   meson,
   ninja,
-  buildWithMeson ? false,
 }:
 
 perl.pkgs.toPerlModule (
@@ -25,36 +22,18 @@ perl.pkgs.toPerlModule (
 
     src = fileset.toSource {
       root = ../.;
-      fileset = fileset.unions (
-        [
-          ../.version
-          ./lib
-        ]
-        ++ lib.optionals (!buildWithMeson) [
-          # FIXME(Qyriad): What the hell is this?
-          # What is it used for and do we still need it?
-          ./MANIFEST
-          ../m4
-          ../mk
-          ./Makefile
-          ./Makefile.config.in
-          ./configure.ac
-          ./local.mk
-        ]
-        ++ lib.optionals buildWithMeson [ ./meson.build ]
-      );
+      fileset = fileset.unions ([
+        ../.version
+        ./lib
+        ./meson.build
+      ]);
     };
 
-    nativeBuildInputs =
-      [ pkg-config ]
-      ++ lib.optionals (!buildWithMeson) [
-        autoconf-archive
-        autoreconfHook
-      ]
-      ++ lib.optionals buildWithMeson [
-        meson
-        ninja
-      ];
+    nativeBuildInputs = [
+      pkg-config
+      meson
+      ninja
+    ];
 
     buildInputs =
       [
diff --git a/perl/local.mk b/perl/local.mk
deleted file mode 100644
index 0eae651d8..000000000
--- a/perl/local.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-nix_perl_sources := \
-  lib/Nix/Store.pm \
-  lib/Nix/Manifest.pm \
-  lib/Nix/SSH.pm \
-  lib/Nix/CopyClosure.pm \
-  lib/Nix/Config.pm.in \
-  lib/Nix/Utils.pm
-
-nix_perl_modules := $(nix_perl_sources:.in=)
-
-$(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllibdir)/Nix)))
-
-lib/Nix/Store.cc: lib/Nix/Store.xs
-	$(trace-gen) xsubpp $^ -output $@
-
-libraries += Store
-
-Store_DIR := lib/Nix
-
-Store_SOURCES := $(Store_DIR)/Store.cc
-
-Store_CXXFLAGS = \
-  $(NIX_CFLAGS) \
-  -I$(shell perl -e 'use Config; print $$Config{archlibexp};')/CORE \
-  -D_FILE_OFFSET_BITS=64 \
-  -Wno-unknown-warning-option -Wno-unused-variable -Wno-literal-suffix \
-  -Wno-reserved-user-defined-literal -Wno-duplicate-decl-specifier -Wno-pointer-bool-conversion
-
-Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS)
-
-ifdef HOST_CYGWIN
-  archlib = $(shell perl -E 'use Config; print $$Config{archlib};')
-  libperl = $(shell perl -E 'use Config; print $$Config{libperl};')
-  Store_LDFLAGS += $(shell find ${archlib} -name ${libperl})
-endif
-
-Store_ALLOW_UNDEFINED = 1
-
-Store_FORCE_INSTALL = 1
-
-Store_INSTALL_DIR = $(perllibdir)/auto/Nix/Store
-
-clean-files += lib/Nix/Config.pm lib/Nix/Store.cc Makefile.config
-- 
cgit v1.2.3