move djdev64 away

.github/workflows/ci-build.yml

@@ -29,9 +29,6 @@ jobs:
         make deb
         sudo dpkg -i ../dj32*.deb
         sudo dpkg -i ../dj64*.deb
-        sudo dpkg -i ../libdjdev64*.deb
-        sudo dpkg -i ../libdjstub64*.deb
-        sudo dpkg -i ../djdev64*.deb
 
     - name: Upload failure logs
       if: ${{ always() && (steps.build.outcome == 'failure') }}

ci_prereq.sh

@@ -5,5 +5,8 @@ sudo apt install -y \
   devscripts \
   equivs
 
-sudo add-apt-repository ppa:stsp-0/thunk-gen
+sudo add-apt-repository -y --no-update ppa:stsp-0/thunk-gen
+sudo add-apt-repository -y --no-update ppa:stsp-0/dj64
+sudo apt update -q
+
 mk-build-deps --install --root-cmd sudo

configure.ac

@@ -6,8 +6,6 @@ AC_CONFIG_FILES([
   Makefile.conf
   dj64.pc
   dj64_s.pc
-  djdev64.pc
-  djstub64.pc
   dj32.pc
 ])
 
@@ -38,17 +36,6 @@ USE32=1
 AC_ARG_ENABLE(64bit,
   AS_HELP_STRING([--disable-64bit], [do not build 64bit components (reduced build)]))
 if test "$enable_64bit" != "no"; then
-  PKG_CHECK_MODULES([LIBELF], [libelf],, [
-    AC_CHECK_LIB(elf, elf_memory, [
-      LIBELF_LIBS=-lelf
-    ], [
-      AC_MSG_ERROR([libelf not installed])
-    ])
-  ])
-
-  AC_CHECK_FUNCS([dlmopen])
-  AC_CHECK_DECLS([RTLD_DEEPBIND],,, [[#include <dlfcn.h>]])
-
   AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot=dir],
     [sysroot directory. default: ${prefix}/${ARCH_DIR}])],
     sysroot="$withval", [

debian/control

@@ -11,10 +11,10 @@ Build-Depends:
     autoconf,
     automake,
     pkgconf,
-    libelf-dev,
+    djdev64-dev,
     ncurses-bin,
     debhelper (>= 9~)
-Homepage: https://github.com/stsp/djgpp-cvs
+Homepage: https://github.com/stsp/dj64dev
 Description: 64-bit djgpp-compatible dev suite
  dj64dev is a 64-bit djgpp-compatible dev suite.
 
@@ -52,27 +52,3 @@ Depends: ${misc:Depends},
 Description: development tools and headers of dj32
  This package contains tools and headers for building dj64-enabled programs
  for 32bit targets.
-
-Package: libdjdev64-0
-Replaces: djdev64
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: djdev64 runtime libraries
- This package contains runtime libraries for djdev64-enabled DPMI host.
-
-Package: libdjstub64-0
-Replaces: djdev64
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: djdev64 runtime libraries
- This package contains runtime libraries for djdev64-enabled DPMI host.
-
-Package: djdev64-dev
-Architecture: any
-Section: libdevel
-Depends: libdjdev64-0 (= ${binary:Version}),
-    libdjstub64-0 (= ${binary:Version}),
-    ${misc:Depends}
-Description: djdev64 development libraries and headers
- This package contains development libraries and headers for
- djdev64-enabled DPMI host.

dj64dev.spec.rpkg

@@ -22,7 +22,7 @@ BuildRequires: gcc
 BuildRequires: binutils
 BuildRequires: gcc-x86_64-linux-gnu
 BuildRequires: binutils-x86_64-linux-gnu
-BuildRequires: elfutils-libelf-devel
+BuildRequires: djdev64-devel
 BuildRequires: thunk-gen
 BuildRequires: pkgconf-pkg-config
 BuildRequires: ctags
@@ -133,35 +133,6 @@ for 32bit targets.
 %{_libdir}/pkgconfig/dj32.pc
 %end
 
-%package djdev64
-Summary: djdev64 runtime libraries
-
-%description djdev64
-This package contains runtime libraries for djdev64-enabled DPMI host.
-%end
-
-%files djdev64
-%defattr(-,root,root)
-%{_libdir}/*.so.*
-%end
-
-%package djdev64-devel
-Summary: djdev64 development libraries and headers
-Requires: dj64dev-djdev64 = {{{ git_dir_version }}}
-
-%description djdev64-devel
-This package contains development libraries and headers for
-djdev64-enabled DPMI host.
-%end
-
-%files djdev64-devel
-%defattr(-,root,root)
-%{_includedir}/djdev64
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/djdev64.pc
-%{_libdir}/pkgconfig/djstub64.pc
-%end
-
 %changelog
 {{{ git_dir_changelog }}}
 %end

makefile

@@ -26,19 +26,13 @@ DJ64LIBV = $(TOP)/lib/libdj64.*.*
 DJ64DEVL = $(TOP)/lib/libdj64.$(SHLIB_EXT)
 DJ64LIBS = $(TOP)/lib/libdj64_s.a
 DJ32LIBS = $(TOP)/lib/libdj32_s.a
-DJDEV64LIB = $(TOP)/lib/libdjdev64.*.*.*
-DJDEV64LIBV = $(TOP)/lib/libdjdev64.*.*
-DJDEV64DEVL = $(TOP)/lib/libdjdev64.$(SHLIB_EXT)
-DJSTUB64LIB = $(TOP)/lib/libdjstub64.*.*.*
-DJSTUB64LIBV = $(TOP)/lib/libdjstub64.*.*
-DJSTUB64DEVL = $(TOP)/lib/libdjstub64.$(SHLIB_EXT)
 DJELFLOAD = $(TOP)/lib/elfload.com
 NC_BUILD = contrib/ncurses/build
 NC_BUILD32 = contrib/ncurses/build32
 
-.PHONY: dj64 djdev64 demos ncurses ncurses32
+.PHONY: dj64 demos ncurses ncurses32
 
-all: Makefile.conf dj64 djdev64 ncurses ncurses32
+all: Makefile.conf dj64 ncurses ncurses32
 	@echo
 	@echo "Done building. You may need to run \"sudo make install\" now."
 	@echo "You can first run \"sudo make uninstall\" to purge the prev install."
@@ -63,9 +57,6 @@ endif
 %.pc: %.pc.in config.status
 	./config.status
 
-djdev64: djdev64.pc djstub64.pc
-	$(MAKE) -C src/djdev64
-
 ifeq ($(USE64),1)
 DJ64PC = dj64.pc dj64_s.pc
 endif
@@ -104,23 +95,8 @@ ifeq ($(NCURSES),1)
 endif
 endif
 
-install_djdev64:
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL) -m 0644 djdev64.pc $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL) -m 0644 djstub64.pc $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL) -d $(DESTDIR)$(includedir)/djdev64
-	cp -rL $(abs_top_srcdir)/src/djdev64/include/djdev64 $(DESTDIR)$(includedir)
-	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(INSTALL) -m 0755 $(DJDEV64LIB) $(DESTDIR)$(libdir)
-	$(CP_FP) $(DJDEV64LIBV) $(DESTDIR)$(libdir)
-	$(CP_FP) $(DJDEV64DEVL) $(DESTDIR)$(libdir)
-	$(INSTALL) -m 0755 $(DJSTUB64LIB) $(DESTDIR)$(libdir)
-	$(CP_FP) $(DJSTUB64LIBV) $(DESTDIR)$(libdir)
-	$(CP_FP) $(DJSTUB64DEVL) $(DESTDIR)$(libdir)
-
-install: install_dj64 install_djdev64 install_demos install32
+install: install_dj64 install_demos install32
 	@echo
-	@echo "Done installing. You may need to run \"sudo ldconfig\" now."
 
 uninstall64:
 ifeq ($(USE64),1)
@@ -131,23 +107,11 @@ endif
 endif
 	$(RM) -r $(DESTDIR)$(datadir)/dj64
 	$(RM) -r $(DESTDIR)$(sysroot)
-	$(RM) -r $(DESTDIR)$(includedir)/djdev64
 	$(RM) $(DESTDIR)$(libdir)/pkgconfig/dj64.pc
 	$(RM) $(DESTDIR)$(libdir)/pkgconfig/dj64_s.pc
 	$(MAKE) -C demos src_uninstall
 endif
 
-uninstall_dev64:
-	$(RM) $(DESTDIR)$(libdir)/pkgconfig/djdev64.pc
-	$(RM) $(DESTDIR)$(libdir)/pkgconfig/djstub64.pc
-	$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJDEV64DEVL))
-	$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJDEV64LIBV))
-	$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJDEV64LIB))
-	$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJSTUB64DEVL))
-	$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJSTUB64LIBV))
-	$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJSTUB64LIB))
-	ldconfig
-
 install32:
 ifeq ($(USE32),1)
 	$(INSTALL) -d $(DESTDIR)$(sysroot32)/lib
@@ -176,11 +140,10 @@ endif
 	$(RM) $(DESTDIR)$(libdir)/pkgconfig/dj32.pc
 endif
 
-uninstall: uninstall64 uninstall_dev64 uninstall32
+uninstall: uninstall64 uninstall32
 
 clean: demos_clean
 	$(MAKE) -C src clean
-	$(MAKE) -C src/djdev64 clean
 	$(RM) *.pc
 	$(RM) -r lib
 ifeq ($(NCURSES),1)