From 9933c03253398298796d9eea64f24c910f44bc40 Mon Sep 17 00:00:00 2001 From: gwenhael Date: Sun, 31 Oct 2021 12:49:17 +0100 Subject: [PATCH 1/2] Update Makefile add DESTDIR to make packaging easier --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 32cd67b..6b5ff6e 100644 --- a/Makefile +++ b/Makefile @@ -138,13 +138,13 @@ $(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU_OBJS) $(CC) $(LDFLAGS) $(X49GP_LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) $(X49GP_LDLIBS) install: all $(TARGET).desktop $(TARGET).man - install -D -m 755 $(TARGET) "$(INSTALL_BINARY_DIR)/$(TARGET)" - install -D -m 644 $(BOOT49GP) "$(INSTALL_DATA_DIR)/$(BOOT49GP)" - install -D -m 644 $(BOOT50G) "$(INSTALL_DATA_DIR)/$(BOOT50G)" - install -D -m 644 $(IMAGE49GP) "$(INSTALL_DATA_DIR)/$(IMAGE49GP)" - install -D -m 644 $(IMAGE50G) "$(INSTALL_DATA_DIR)/$(IMAGE50G)" - install -D -m 644 $(TARGET).desktop "$(INSTALL_MENU_DIR)/$(TARGET).desktop" - install -D -m 644 $(TARGET).man "$(INSTALL_MAN_DIR)/$(TARGET).1" + install -D -m 755 $(TARGET) "$(DESTDIR)$(INSTALL_BINARY_DIR)/$(TARGET)" + install -D -m 644 $(BOOT49GP) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(BOOT49GP)" + install -D -m 644 $(BOOT50G) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(BOOT50G)" + install -D -m 644 $(IMAGE49GP) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE49GP)" + install -D -m 644 $(IMAGE50G) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE50G)" + install -D -m 644 $(TARGET).desktop "$(DESTDIR)$(INSTALL_MENU_DIR)/$(TARGET).desktop" + install -D -m 644 $(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET).1" $(TARGET).desktop: x49gp.desktop.in perl -p -e "s!TARGET!$(TARGET)!" $@ From 476b1ccf1057e266b4a709e4ade9fe13fc9514a5 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Sun, 31 Oct 2021 14:10:00 +0100 Subject: [PATCH 2/2] fix compilation on slackware-current 2021-10-31 --- Makefile | 2 +- qemu/qemu-git/configure-small | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6b5ff6e..9a24991 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ CC += $(shell if [ "`uname -m`" = "sparc64" -o "`uname -m`" = "sun4u" ]; then ec COCOA_LIBS=$(shell if [ "`uname -s`" = "Darwin" ]; then echo "-F/System/Library/Frameworks -framework Cocoa -framework IOKit"; fi) -X49GP_CFLAGS = -O2 -Wall -Werror $(DEBUG) $(INCLUDES) $(DEFINES) +X49GP_CFLAGS = -O2 -Wall -Werror $(DEBUG) $(INCLUDES) $(DEFINES) -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=array-bounds X49GP_LDFLAGS += $(DEBUG) $(GDB_LDFLAGS) X49GP_LDLIBS = $(X49GP_LIBS) $(GDB_LIBS) $(COCOA_LIBS) diff --git a/qemu/qemu-git/configure-small b/qemu/qemu-git/configure-small index 2f629e4..989e40e 100755 --- a/qemu/qemu-git/configure-small +++ b/qemu/qemu-git/configure-small @@ -81,7 +81,7 @@ ar="${cross_prefix}${ar}" ld="${cross_prefix}${ld}" # default flags for all hosts -QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" +QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS -Wno-error=array-bounds" CFLAGS="-g $CFLAGS" QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" @@ -96,7 +96,7 @@ int main(void) { } EOF for flag in $gcc_flags; do if compile_prog "$QEMU_CFLAGS" "$flag" ; then - QEMU_CFLAGS="$flag $QEMU_CFLAGS" + QEMU_CFLAGS="$flag $QEMU_CFLAGS" fi done @@ -771,9 +771,9 @@ fi # enable/disable if test -z "$zero_malloc" ; then if test "$z_version" = "50" ; then - zero_malloc="no" + zero_malloc="no" else - zero_malloc="yes" + zero_malloc="yes" fi fi