[Debian-astro-commits] [gyoto] 98/221: Distribute our own yorick/Makepkg. Out-of-tree builds uninstall is buggy in the Yorick-distributed version.
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit 0f1fc51888fbc968d5fa270224fec8ac12af840f
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Thu Nov 20 17:19:50 2014 +0100
Distribute our own yorick/Makepkg. Out-of-tree builds uninstall is buggy in the Yorick-distributed version.
---
yorick/Makefile.in | 8 +-
yorick/Makepkg | 244 +++++++++++++++++++++++++++++++++++++++++++++
yorick/stdplug/Makefile.in | 3 +-
3 files changed, 251 insertions(+), 4 deletions(-)
diff --git a/yorick/Makefile.in b/yorick/Makefile.in
index c5ac7a9..688ce0c 100644
--- a/yorick/Makefile.in
+++ b/yorick/Makefile.in
@@ -75,7 +75,8 @@ PKG_I_DEPS=$(PKG_I)
Y_DISTMAKE=distmake
include $(Y_MAKEDIR)/Make.cfg
-include $(Y_MAKEDIR)/Makepkg
+# Yorick-distributed Makepkg is not reliable for out-of-tree builds.
+include @top_srcdir@/yorick/Makepkg
include $(Y_MAKEDIR)/Make$(TGT)
# override macros Makepkg sets for rules and other macros
@@ -144,14 +145,15 @@ install::
$(YNSTALL) @srcdir@/gyotoy.xml $(DEST_Y_SITE)/glade
$(YNSTALL) @srcdir@/gyotoy.png $(DEST_Y_SITE)/data
$(YNSTALL) @srcdir@/gyotoy $(DEST_Y_SITE)/bin
- -ln $(DEST_Y_SITE)/bin/gyotoy $(DESTDIR)$(prefix)/bin/
+ -ln $(DEST_Y_SITE)/bin/gyotoy $(DESTDIR)$(exec_prefix)/bin/
$(YNSTALL) @srcdir@/gyotoy.1 $(DESTDIR)$(prefix)/share/man/man1
$(YNSTALL) gyoto.info $(DEST_PKG_INSTALLED_DIR)
uninstall::
cd stdplug; make uninstall
- rm -f $(DEST_Y_SITE)/include/ygyoto*
+ cd $(DEST_Y_SITE)/include ; rm -f ygyoto.h ygyoto_idx.h ygyoto_supplier.C
rm -f $(DEST_Y_SITE)/glade/gyotoy.xml
+ rm -f $(DEST_Y_SITE)/data/gyotoy.png
rm -f $(DEST_Y_HOME)/bin/gyotoy
rm -f $(DESTDIR)$(exec_prefix)/bin/gyotoy
rm -f $(DESTDIR)$(prefix)/share/man/man1/gyotoy.1
diff --git a/yorick/Makepkg b/yorick/Makepkg
new file mode 100644
index 0000000..46f49b3
--- /dev/null
+++ b/yorick/Makepkg
@@ -0,0 +1,244 @@
+# -*-mode: makefile;-*-
+# $Id: Makepkg,v 1.4 2010-08-13 09:46:16 thiebaut Exp $
+# standard parts of yorick package Makefile
+SHELL=/bin/sh
+MAKE=make
+
+# ------------------------------------------------------------------------
+
+# Any libpkg.a file may require -L and -l linker options in order
+# to be able to load it (a corresponding pkg.so would have already
+# been linked against those when it was built). Since we want to
+# be able to concoct executable yoricks with any subset of those
+# libpkg.a statically linked, the required -L and -l options, if
+# any, must be recorded in a libpkg.a.dep file kept alongside libpkg.a.
+# The rule that does the static link uses the yorick/libdep.sh script
+# to find and extract the information from these .dep files, in
+# order to create the appropriate linker options.
+
+# beware a subtle feature of Makefile semantics:
+# macros used in targets and their prerequisites take their
+# "instantaneous" values (make builds dependency tree as it goes)
+# macros used in rules or RHS of assignment take their
+# "final" values (actions actually happen after entire file parsed)
+
+# these macros are targets or prerequisites:
+# Makefile must define these _before_ including Makepkg
+# Y_MAKEDIR
+# TGT
+# OBJS
+# PKG_EXE, PKG_LIB, PKG_DLL, PKG_DEF
+# EXE_TARGETS, LIB_TARGETS, DLL_TARGETS
+# CODGER_DEP, H_YWRAP
+# PKG_I_DEPS (same as PKG_I unless PKG_I_DIR)
+# ALL_TARGETS
+
+# these macros are used in rules directly:
+# LD_DLL, DLL_LIBS
+# LD_EXE, Y_MAIN_O, EXE_LIBS, PKG_DEPLIBS (to make .dep file)
+# AR, ARFLAGS, RANLIB
+# CODGER, PKG_NAME, PKG_I, PKG_I_DIR, EXTRA_PKGS
+# Y_EXE, Y_SITE, Y_HOME
+# PKG_CLEAN, Y_BINDIR
+# DESTDIR, DEST_Y_SITE, DEST_Y_HOME, DEST_Y_BINDIR
+
+# defined in package Makefile (which includes this Makepkg):
+# Y_MAKEDIR directory containing Make.cfg, Makepkg, Makeexe, Makedll
+# Y_EXE path to yorick executable
+# Y_EXE_PKGS statically loaded packages in yorick executable
+# Y_EXE_HOME path Y_HOME for yorick executable
+# Y_EXE_SITE path Y_SITE for yorick executable
+# COPT C optimization flags, COPT_DEFAULT
+# TGT exe or dll, the target to be built, DEFAULT_TGT
+# PKG_NAME name of this package
+# PKG_I startup include file(s) for this package
+# OBJS list of object files
+# PKG_EXENAME normally just yorick
+# PKG_DEPLIBS list of load options (-L, -l) required for this package
+# PKG_CFLAGS optional additional CFLAGS for this package (e.g. -I...)
+# PKG_LDFLAGS optional additional LDFLAGS for this package (rare)
+# EXTRA_PKGS additional static packages if TGT=exe, default Y_EXE_PKGS
+# Y_HOME_ALT alternate Y_HOME directory to scan for EXTRA_PKGS
+# PKG_CLEAN optional list of non-standard cleanup files
+# PKG_I_START optional autoload file(s) for this package
+# PKG_I_EXTRA optional ordinary yorick include file(s) for this package
+
+# defined in Make.cfg
+# Y_CFG_HOME, Y_CFG_SITE Y_HOME, Y_SITE defined by yorick configure script
+# these should always both be relocate in modern yorick installations
+# Y_HOME, Y_SITE obsolete, set to Y_CFG_* for backward compatibility
+
+# ALL_TARGETS optional prerequisites for all:
+# EXE_TARGETS optional prerequisites for executable
+# LIB_TARGETS optional prerequisites for static library
+# DLL_TARGETS optional prerequisites for dynamic library
+
+# DESTDIR optional (un)install root
+# DEST_Y_SITE optional install Y_SITE (default: $(DESTDIR)$(Y_EXE_SITE))
+# DEST_Y_HOME optional install Y_HOME (default: $(DESTDIR)$(Y_EXE_HOME))
+# DEST_Y_BINDIR optional install Y_BINDIR (default: $(DESTDIR)$(Y_BINDIR))
+
+# ------------------------------------------------------------------------
+
+# defined in Make.cfg:
+# CC
+# Y_CFLAGS non-optimization flags required to compile (rare)
+# Y_LDFLAGS non-optimization flags required to laod (rare)
+# EXE_SFX .exe for WIN32, blank for UNIX
+# PLUG_SFX .dll for WIN32, .so for UNIX, .sl for HPUX
+# PLUG_EXPORT ld flags for yorick exe that can dlopen packages
+# PLUG_LIB ld library containing dlopen
+# PLUG_SHARED ld flags to create a dll (may reference Y_EXE)
+# PLUG_PIC cc flags unique to modules to go in a dll (-fPIC)
+
+PKG_EXE=$(PKG_EXENAME)$(EXE_SFX)
+PKG_LIB=lib$(PKG_NAME).a
+PKG_DLL=$(PKG_NAME)$(PLUG_SFX)
+PKG_DEF=$(PKG_NAME).def
+
+Y_LIBEXE=$(Y_EXE_HOME)/lib
+Y_INCLUDE=$(Y_EXE_HOME)/include
+
+CODGER=$(Y_LIBEXE)/codger$(EXE_SFX)
+LIBDEP=$(Y_LIBEXE)/libdep.sh
+
+# might want to override these on make command line
+Y_IDIR=-I$(Y_INCLUDE)
+Y_LDIR=-L$(Y_LIBEXE)
+PKG_L_OPT=-L. -l$(PKG_NAME)
+
+# note that PLUG is defined in Makeexe or Makedll
+CFLAGS=$(COPT) $(Y_CFLAGS) $(PKG_CFLAGS) $(PLUG) -I. $(Y_IDIR)
+LDFLAGS=$(COPT) $(Y_LDFLAGS) $(PKG_LDFLAGS)
+ARFLAGS=rc
+
+Y_HOME_ALT=
+EXTRA_LIBS=`$(LIBDEP) "$(Y_EXE_HOME)" "$(Y_HOME_ALT)" $(EXTRA_PKGS)`
+LD_EXE=$(CC) $(LDFLAGS) $(PLUG_EXPORT)
+EXE_LIBS=$(PKG_L_OPT) $(Y_LDIR) $(PKG_DEPLIBS) $(EXTRA_LIBS) -lyor $(SYS_LIBS)
+Y_MAIN_O=$(Y_LIBEXE)/main.o
+
+LD_DLL=$(CC) $(LDFLAGS) $(PLUG_SHARED)
+DLL_LIBS=$(PKG_DEPLIBS) $(MATHLIB)
+DLL_DEF=$(YWIN_DEF)
+
+SYS_LIBS=$(X11LIB) $(FPELIB) $(MATHLIB) $(PLUG_LIB)
+
+# here are full warning options for gcc (for COPT)
+GCCOPTS=-g -O2 -ansi -pedantic -Wall $(GCCPROTO)
+GCCPROTO=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
+
+#------------------------------------------------------------------------
+# standard targets
+# macros in target names or dependency lists must be defined above here
+
+all: $(ALL_TARGETS) $(TGT)
+exe: $(PKG_EXE)
+dll: $(PKG_DLL)
+
+# Makeexe or Makedll used to get portable conditional make:
+# contain PLUG macro, PKG_EXE, PKG_LIB, PKG_DLL targets
+$(PKG_DEF):
+ echo IMPORTS >$@
+ sed -e "s/.*/\0 = `basename $(Y_EXE)`.\0/" <$(Y_LIBEXE)/yorapi.def >>$@
+
+ywrap.c: Makefile $(CODGER_DEP) $(PKG_I_DEPS)
+ $(CODGER) w $(PKG_NAME) $(PKG_I_DIR) $(PKG_I)
+
+yinit.c: Makefile $(CODGER_DEP)
+ $(CODGER) i "$(Y_CFG_HOME)" "$(Y_CFG_SITE)" $(EXTRA_PKGS) $(PKG_NAME)
+
+yinit.o: yinit.c $(H_YWRAP)
+ywrap.o: ywrap.c $(H_YWRAP)
+
+check: check-$(TGT)
+check-exe: $(PKG_EXE) check.i
+ ./$(PKG_EXE) -batch check.i
+check-dll: $(PKG_DLL) check.i
+ $(Y_EXE) -batch check.i
+
+dist: distclean
+ D=`pwd`; D=`basename "$$D"`; cd ..; tar cvf - "$$D"|gzip - >"$$D.tgz"
+
+# following have two colons so you can define additional rules elsewhere
+# install-exe build and install PKG_EXE assuming TGT=exe
+# install-dll build and install PKG_DLL assuming TGT=dll
+# install build and install PKG_$(TGT)
+# install0 build PKG_EXE, install all but PKG_EXE executable
+# make clean; make TGT=exe install0; make clean; make TGT=dll install
+# builds and installs both static and dynamic libraries
+# use install instead of install0 to also install static executable
+
+Y_GROUP=`cat $(Y_LIBEXE)/install.grp`
+YNSTALL=$(Y_LIBEXE)/install.sh $(Y_GROUP)
+DESTDIR=
+DEST_Y_SITE=$(DESTDIR)$(Y_EXE_SITE)
+DEST_Y_HOME=$(DESTDIR)$(Y_EXE_HOME)
+DEST_Y_BINDIR=$(DESTDIR)$(Y_BINDIR)
+install:: install-$(TGT)
+ $(YNSTALL) $(PKG_I_DEPS) $(DEST_Y_SITE)/i0
+ if test -n "$(PKG_I_START)"; then $(YNSTALL) $(PKG_I_START) $(DEST_Y_HOME)/i-start; fi
+ if test -n "$(PKG_I_EXTRA)"; then $(YNSTALL) $(PKG_I_EXTRA) $(DEST_Y_SITE)/i; fi
+ if test -f "$(PKG_NAME).cfg"; then $(YNSTALL) $(PKG_NAME).cfg $(DEST_Y_SITE)/lib; fi
+install-exe:: install0
+ $(YNSTALL) $(PKG_EXE) $(DEST_Y_BINDIR)
+install0:: $(PKG_EXE)
+ $(YNSTALL) $(PKG_LIB) $(DEST_Y_HOME)/lib
+ $(RANLIB) $(DEST_Y_HOME)/lib/$(PKG_LIB)
+ if test -f "$(PKG_LIB).dep"; then $(YNSTALL) $(PKG_LIB).dep $(DEST_Y_SITE)/lib; fi
+install-dll:: $(PKG_DLL)
+ $(YNSTALL) $(PKG_DLL) $(DEST_Y_HOME)/lib
+
+uninstall::
+ if test $(PKG_EXE) != yorick; then rm -f $(DEST_Y_BINDIR)/$(PKG_EXE); fi
+ rm -f $(DEST_Y_HOME)/lib/$(PKG_LIB) $(DEST_Y_HOME)/lib/$(PKG_LIB).dep $(DEST_Y_HOME)/lib/$(PKG_DLL)
+ cd $(DEST_Y_SITE)/i0; for file in $(PKG_I); do rm -f `basename $$file`; done
+ if test -n "$(PKG_I_START)"; then cd $(DEST_Y_HOME)/i-start; for file in $(PKG_I_START); do rm -f `basename $$file`; done; fi
+ if test -n "$(PKG_I_EXTRA)"; then cd $(DEST_Y_SITE)/i; for file in $(PKG_I_EXTRA); do rm -f `basename $$file`; done; fi
+
+# non-Y_HOME package installation to directory DEST (default relocate)
+# install2 install to directory other than Y_EXE_HOME
+# uninstall2 uninstall from directory other than Y_EXE_HOME
+DEST=relocate
+install2:
+ echo $(Y_EXE_HOME) >Y_HOME.txt
+ @$(MAKE) DEST_Y_HOME=$(DEST) DEST_Y_SITE=$(DEST) DEST_Y_BINDIR=$(DEST)/bin TGT=$(TGT) install
+ $(YNSTALL) Y_HOME.txt $(DEST)/bin
+uninstall2:
+ @$(MAKE) DEST_Y_HOME=$(DEST) DEST_Y_SITE=$(DEST) DEST_Y_BINDIR=$(DEST)/bin TGT=$(TGT) uninstall
+ rm -f $(DEST)/bin/Y_HOME.txt
+ if test $(DEST) = relocate; then rm -rf relocate; fi
+
+debug:
+ @$(MAKE) TGT=exe COPT=-g
+
+clean::
+ rm -f *~ '#'* core* *.core a.out yinit.* ywrap.* *.dep so_locations Make.tmp
+ rm -f Y_HOME.txt
+ rm -f $(OBJS) $(PKG_EXE) $(PKG_LIB) $(PKG_DLL) $(PKG_DEF) $(PKG_CLEAN)
+distclean:: clean $(Y_DISTMAKE)
+ rm -f Makefile.old
+ rm -rf relocate
+distmake:
+ if S="s/^Y_MAKEDIR=.*/Y_MAKEDIR=/;s/^Y_EXE=.*/Y_EXE=/;\
+ s/^Y_EXE_PKGS=.*/Y_EXE_PKGS=/;s/^Y_EXE_SITE=.*/Y_EXE_SITE=/;\
+ s/^Y_EXE_HOME=.*/Y_EXE_HOME=/;s/^Y_HOME_PKG=.*/Y_HOME_PKG=/";\
+ sed -e "$$S" Makefile >Make.tmp; then mv Make.tmp Makefile; fi
+
+# create optional $(PKG_NAME).cfg file which records package configuration
+# do make dumpconfig before make install
+# this information insufficient on some platforms
+dumpconfig:
+ @rm -f $(PKG_NAME).cfg
+ @echo "$(PKG_NAME).cfg built by Make on `date`" >> $(PKG_NAME).cfg
+ @echo "HOST=`uname -a`" >>$(PKG_NAME).cfg
+ @echo 'PKG_CFLAGS=$(PKG_CFLAGS)' >> $(PKG_NAME).cfg
+ @echo 'PKG_LDFLAGS=$(PKG_LDFLAGS)' >> $(PKG_NAME).cfg
+ @echo 'PKG_DEPLIBS=$(PKG_DEPLIBS)' >> $(PKG_NAME).cfg
+ @echo 'CC_FULL=$(CC)' >> $(PKG_NAME).cfg
+# grab the executable name from the $CC
+ @echo "CC_PATH=`which \`echo $(CC) | awk 'BEGIN { FS=\" \" };{print $$1}'\``" >> $(PKG_NAME).cfg
+# grab the arguments (everyhing after the excutable) from CC
+ @echo "CC_OPT=`echo $(CC) | awk 'BEGIN { FS=\" \" };{{ for (f=2; f <= NF; f++) { if (f != 1 && f != 9) printf(\"%s \", $$f);}}}'`" >>$(PKG_NAME).cfg
+ @echo "LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" >>$(PKG_NAME).cfg
+ @echo "PATH=$(PATH)" >>$(PKG_NAME).cfg
diff --git a/yorick/stdplug/Makefile.in b/yorick/stdplug/Makefile.in
index b831069..36ff57b 100644
--- a/yorick/stdplug/Makefile.in
+++ b/yorick/stdplug/Makefile.in
@@ -83,7 +83,8 @@ PKG_I_DEPS=$(PKG_I)
Y_DISTMAKE=distmake
include $(Y_MAKEDIR)/Make.cfg
-include $(Y_MAKEDIR)/Makepkg
+# Yorick-distributed Makepkg is not reliable for out-of-tree builds.
+include @top_srcdir@/yorick/Makepkg
include $(Y_MAKEDIR)/Make$(TGT)
# override macros Makepkg sets for rules and other macros
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list