From: helmut@subdivi.de   
      
   Source: gplanarity   
   Version: 17906+fork202521211-1   
   Tags: patch upstream   
   User: debian-cross@lists.debian.rog   
   Usertags: ftcbfs   
      
   gplanarity used to cross build until debian/patches/cross.patch was   
   dropped. I suppose it no longer applied. Here is an updated version.   
   Could you forward it upstream this time around?   
      
   Helmut   
      
   Description: Fix cross build   
    Do not hardcode LD & PKG_CONFIG   
   Author: Helmut Grohne    
      
   --- gplanarity-17906+fork202521211.orig/Makefile   
   +++ gplanarity-17906+fork202521211/Makefile   
   @@ -4,7 +4,8 @@   
      
    TARGET = gPlanarity   
    CC = gcc   
   -LD = gcc   
   +LD = $(CC)   
   +PKG_CONFIG ?= pkg-config   
    export INSTALL = install   
    PREFIX = $(DESTDIR)/usr   
    BINDIR = $(PREFIX)/games   
   @@ -50,24 +51,24 @@   
    gameboard_logic_fade.o graph_generate_mesh2.o graph_region.o   
    CAIROVER = >= 1.0.0   
    GTKVER = >= 3.24.0   
   -GCF = `pkg-config --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig"`   
   -LDF = `pkg-config --libs "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig"`   
   +GCF = `$(PKG_CONFIG) --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER)   
   freetype2 fontconfig"`   
   +LDF = `$(PKG_CONFIG) --libs "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig"`   
      
    all: all-local all-recursive   
      
    all-local:   
   - pkg-config --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig" 1>/dev/null   
   + $(PKG_CONFIG) --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig" 1>/dev/null   
    $(MAKE) target CFLAGS='$(CFLAGS) -ffast-math $(GCF) $(ADD_DEF)'   
      
    all-recursive:   
    for D in $(SUBDIRS); do make -C $$D || exit 1; done   
      
    debug:   
   - pkg-config --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig" 1>/dev/null   
   + $(PKG_CONFIG) --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig" 1>/dev/null   
    $(MAKE) target CFLAGS='-g -Wall -W -Wno-unused-parameter -D__NO_MATH_INLINES   
   $(GCF) $(ADD_DEF) $(CLFAGS)'   
      
    profile:   
   - pkg-config --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig" 1>/dev/null   
   + $(PKG_CONFIG) --cflags "gtk+-3.0 $(GTKVER) cairo $(CAIROVER) freetype2   
   fontconfig" 1>/dev/null   
    $(MAKE) target CFLAGS='-pg -g -O2 -ffast-math $(GCF) $(ADD_DEF) $(CFLAGS)'   
      
    clean: clean-local clean-recursive   
   @@ -89,9 +90,10 @@   
    include $(SRC:.c=.d)   
    endif   
      
   -target: $(OBJ)   
   +target: $(TARGET)   
   +$(TARGET): $(OBJ)   
    ./touch-version   
   - $(LD) $(OBJ) $(LDFLAGS) -o $(TARGET) $(LIBS) -lm $(LDF)   
   + $(LD) $^ $(LDFLAGS) -o $@ $(LIBS) -lm $(LDF)   
      
    install: install-local install-recursive   
      
   --- SoupGate-Win32 v1.05   
    * Origin: you cannot sedate... all the things you hate (1:229/2)   
|