Package: dehydra Tags: patch
the gcc-4.5 in experimental has a backport from current trunk to search for plugins in the plugin directory. Install the plugin in this directory and a user doesn't need to know to the installation location of the plugin (changed the generic "libs" name to "dehydra-libs".
diff -Nru dehydra-0.9.hg20100701/debian/install dehydra-0.9.hg20100827/debian/install --- dehydra-0.9.hg20100701/debian/install 2010-08-27 12:26:00.000000000 +0200 +++ dehydra-0.9.hg20100827/debian/install 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -gcc_dehydra.so usr/lib/dehydra -libs usr/share/dehydra diff -Nru dehydra-0.9.hg20100701/debian/install.in dehydra-0.9.hg20100827/debian/install.in --- dehydra-0.9.hg20100701/debian/install.in 1970-01-01 01:00:00.000000000 +0100 +++ dehydra-0.9.hg20100827/debian/install.in 2010-08-27 12:26:00.000000000 +0200 @@ -0,0 +1,2 @@ +gcc_dehydra.so @plugin_dir@ +libs usr/share/dehydra diff -Nru dehydra-0.9.hg20100701/debian/links dehydra-0.9.hg20100827/debian/links --- dehydra-0.9.hg20100701/debian/links 2010-08-27 12:26:00.000000000 +0200 +++ dehydra-0.9.hg20100827/debian/links 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/share/dehydra/libs usr/lib/dehydra/libs diff -Nru dehydra-0.9.hg20100701/debian/links.in dehydra-0.9.hg20100827/debian/links.in --- dehydra-0.9.hg20100701/debian/links.in 1970-01-01 01:00:00.000000000 +0100 +++ dehydra-0.9.hg20100827/debian/links.in 2010-08-27 12:26:00.000000000 +0200 @@ -0,0 +1 @@ +usr/share/dehydra/libs @plugin_dir@/dehydra-libs diff -Nru dehydra-0.9.hg20100701/debian/rules dehydra-0.9.hg20100827/debian/rules --- dehydra-0.9.hg20100701/debian/rules 2010-08-27 12:26:00.000000000 +0200 +++ dehydra-0.9.hg20100827/debian/rules 2010-08-27 12:26:00.000000000 +0200 @@ -3,11 +3,16 @@ export CC=/usr/bin/gcc-4.5 export CXX=/usr/bin/g++-4.5 +plugin_dir := $(shell $(CC) -print-file-name=plugin | sed 's,\(/4\.[0-9]\)\.[0-9],\1,') + override_dh_auto_configure: + ln -sf libs dehydra-libs ./configure --enable-C override_dh_auto_build: $(MAKE) BUILD_TREEHYDRA= LDFLAGS="-lmozjs -shared" + sed 's,@plugin_dir@,$(plugin_dir),' debian/install.in > debian/install + sed 's,@plugin_dir@,$(plugin_dir),' debian/links.in > debian/links override_dh_auto_test: $(MAKE) check BUILD_TREEHYDRA= @@ -15,6 +20,8 @@ override_dh_auto_clean: dh_auto_clean rm -f Makefile config.mk dehydra-config.h + rm -f dehydra-libs + rm -f debian/install debian/links %: dh $@ diff -Nru dehydra-0.9.hg20100701/dehydra.c dehydra-0.9.hg20100827/dehydra.c --- dehydra-0.9.hg20100701/dehydra.c 2010-07-12 13:06:21.000000000 +0200 +++ dehydra-0.9.hg20100827/dehydra.c 2010-08-27 12:26:00.000000000 +0200 @@ -77,7 +77,7 @@ static const char *STATIC = "isStatic"; static const char *VIRTUAL = "isVirtual"; static const char *INCLUDE_PATH = "include_path"; -static const char *STD_INCLUDE = "libs"; +static const char *STD_INCLUDE = "dehydra-libs"; static const char *VERSION_STRING = "gcc_version"; static const char *FRONTEND = "frontend"; static const char *EXTERN = "isExtern";
