Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -rNu gnurobots/01_link_order.patch gnurobots-fixed/01_link_order.patch
- --- gnurobots/01_link_order.patch 1970-01-01 03:00:00.000000000 +0300
- +++ gnurobots-fixed/01_link_order.patch 2012-04-10 13:19:05.728908808 +0400
- @@ -0,0 +1,53 @@
- +Description: List libraries after the objects that require them
- +Author: Colin Watson <cjwatson@ubuntu.com>
- +
- +
- +Index: b/src/Makefile.am
- +===================================================================
- +--- a/src/Makefile.am
- ++++ b/src/Makefile.am
- +@@ -28,5 +28,5 @@
- +
- + gnurobots_SOURCES = main.c api.c map.c grobot.c \
- + ui-window.c ui-cmdwin.c ui-arena.c
- +-gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
- ++gnurobots_LDADD = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
- + $(GTK2_LIBS) $(VTE_LIBS) -lutil
- +
- +
- +Index: b/src/Makefile.in
- +===================================================================
- +--- a/src/Makefile.in
- ++++ b/src/Makefile.in
- +@@ -47,9 +47,10 @@
- + grobot.$(OBJEXT) ui-window.$(OBJEXT) ui-cmdwin.$(OBJEXT) \
- + ui-arena.$(OBJEXT)
- + gnurobots_OBJECTS = $(am_gnurobots_OBJECTS)
- +-gnurobots_LDADD = $(LDADD)
- +-gnurobots_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gnurobots_LDFLAGS) \
- +- $(LDFLAGS) -o $@
- ++am__DEPENDENCIES_1 =
- ++gnurobots_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- ++ $(am__DEPENDENCIES_1)
- + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- + depcomp = $(SHELL) $(top_srcdir)/depcomp
- + am__depfiles_maybe = depfiles
- +@@ -174,7 +175,7 @@
- + gnurobots_SOURCES = main.c api.c map.c grobot.c \
- + ui-window.c ui-cmdwin.c ui-arena.c
- +
- +-gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
- ++gnurobots_LDADD = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
- + $(GTK2_LIBS) $(VTE_LIBS) -lutil
- +
- + all: all-am
- +@@ -235,7 +236,7 @@
- + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- + gnurobots$(EXEEXT): $(gnurobots_OBJECTS) $(gnurobots_DEPENDENCIES)
- + @rm -f gnurobots$(EXEEXT)
- +- $(gnurobots_LINK) $(gnurobots_OBJECTS) $(gnurobots_LDADD) $(LIBS)
- ++ $(LINK) $(gnurobots_OBJECTS) $(gnurobots_LDADD) $(LIBS)
- +
- + mostlyclean-compile:
- + -rm -f *.$(OBJEXT)
- diff -rNu gnurobots/PKGBUILD gnurobots-fixed/PKGBUILD
- --- gnurobots/PKGBUILD 1970-01-01 12:13:08.000000000 +0300
- +++ gnurobots-fixed/PKGBUILD 2012-04-10 13:19:27.892061267 +0400
- @@ -11,13 +11,18 @@
- license=('GPL')
- depends=('vte' 'libxpm' 'guile')
- -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
- -md5sums=('2435f16a80b21ad348aa558e2e0ae9d8')
- +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
- + '01_link_order.patch')
- +md5sums=('2435f16a80b21ad348aa558e2e0ae9d8' '49ddbab6a10ae6da7d9d8fc5feac399b')
- build() {
- cd "$srcdir/$pkgname-$pkgver"
- + # fix link order to list libraries after the objects that require them
- + # Copied from http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/oneiric/gnurobots/oneiric/view/head:/debian/patches/01_link_order.patch?start_revid=11
- + patch -p1 < "$srcdir/01_link_order.patch"
- +
- ./configure --prefix=/usr --with-x || return 1
- make || return 1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement