diff options
| author | albator <albator@arcadia.vtf> | 2011-10-21 20:16:07 +0200 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-10-21 20:16:07 +0200 |
| commit | 7a0adf35896618a7570e425941fc1b74c54def47 (patch) | |
| tree | 16dab9d8bfbd93575440f357c70907cbb5480980 /mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff | |
| parent | cd71be65dc30c8007ec54becdf6c50260ed8e908 (diff) | |
| parent | a8707e2a9f22d082cecb8ea6079175076f983c55 (diff) | |
| download | tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff')
| -rw-r--r-- | mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff new file mode 100644 index 000000000..6cf062d51 --- /dev/null +++ b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff @@ -0,0 +1,33 @@ +--- Makefile 2003-04-10 10:21:01.000000000 +0200 ++++ Makefile.oden 2008-07-18 21:41:19.000000000 +0200 +@@ -23,6 +23,8 @@ + LIBBASE = libresmgr.so + LIB = $(LIBBASE).$(VERSION) + LIBOBJS = $(addprefix .lobjs/,conn.o client.o glob.o) ++LDFLAGS = ++PAMLIBS = -lpam + + ALL = $(SRV) $(CLT) $(LIB) $(PAM) tester + +@@ -46,17 +48,17 @@ + rm -rf $(ALL) $(LIBBASE) .objs .lobjs + + $(SRV): $(SRVOBJS) $(LIB) +- $(CC) -o $@ $(SRVOBJS) -L. -lresmgr ++ $(CC) $(LDFLAGS) -o $@ $(SRVOBJS) -L. -lresmgr + + $(CLT): $(CLTOBJS) $(LIB) +- $(CC) -o $@ $(CLTOBJS) -L. -lresmgr ++ $(CC) $(LDFLAGS) -o $@ $(CLTOBJS) -L. -lresmgr + + $(LIB): $(LIBOBJS) +- $(CC) -shared -Wl,-soname,$(notdir $(LIB)) -o $@ $(LIBOBJS) ++ $(CC) -shared -Wl,-soname,$(notdir $(LIB)) $(LDFLAGS) -o $@ $(LIBOBJS) + ln -sf $(LIB) $(LIBBASE) + + $(PAM): $(PAMOBJS) $(LIB) +- $(CC) -shared -o $@ $(PAMOBJS) -L. -lresmgr ++ $(CC) -shared $(LDFLAGS) -o $@ $(PAMOBJS) $(PAMLIBS) -L. -lresmgr + + tester: .objs/tester.o $(LIB) + $(CC) -o $@ .objs/tester.o -L. -lresmgr |