RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: popt Date: 12-Feb-2010 23:29:13 Branch: HEAD Handle: 2010021222291200 Modified files: popt .cvsignore popt/popt.xcodeproj project.pbxproj Log: - add -liconv for static linkage. - ignore the xcode build directory Summary: Revision Changes Path 1.25 +1 -0 popt/.cvsignore 1.2 +6 -2 popt/popt.xcodeproj/project.pbxproj ____________________________________________________________________________ patch -p0 <<'@@ .' Index: popt/.cvsignore ============================================================================ $ cvs diff -u -r1.24 -r1.25 .cvsignore --- popt/.cvsignore 18 Aug 2009 22:06:22 -0000 1.24 +++ popt/.cvsignore 12 Feb 2010 22:29:12 -0000 1.25 @@ -8,6 +8,7 @@ Makefile.in aclocal.m4 autom4te* +build config.cache config.guess config.h @@ . patch -p0 <<'@@ .' Index: popt/popt.xcodeproj/project.pbxproj ============================================================================ $ cvs diff -u -r1.1 -r1.2 project.pbxproj --- popt/popt.xcodeproj/project.pbxproj 12 Feb 2010 22:01:26 -0000 1.1 +++ popt/popt.xcodeproj/project.pbxproj 12 Feb 2010 22:29:12 -0000 1.2 @@ -72,7 +72,7 @@ 0D006A061125FADD00A2FA32 /* testit.sh */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.sh; path = testit.sh; sourceTree = "<group>"; }; 0D3BACFC1125FF5300B3E80C /* popt.ps */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = popt.ps; sourceTree = "<group>"; }; 0D3EA3C31125E529001C69E6 /* lookup3.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = lookup3.c; sourceTree = "<group>"; }; - 0D3EA3C51125E537001C69E6 /* popt.c */ = {isa = PBXFileReference; explicitFileType = compiled; fileEncoding = 7; path = popt.c; sourceTree = "<group>"; }; + 0D3EA3C51125E537001C69E6 /* popt.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 7; path = popt.c; sourceTree = "<group>"; }; 0D3EA3C71125E53F001C69E6 /* popt.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = popt.h; sourceTree = "<group>"; }; 0D3EA3C91125E54B001C69E6 /* poptconfig.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptconfig.c; sourceTree = "<group>"; }; 0D3EA3CB1125E553001C69E6 /* popthelp.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = popthelp.c; sourceTree = "<group>"; }; @@ -344,6 +344,7 @@ GCC_OPTIMIZATION_LEVEL = 2; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; INSTALL_PATH = /usr/local/lib; + OTHER_LDFLAGS = "-liconv"; PREBINDING = NO; PRODUCT_NAME = popt; }; @@ -377,7 +378,10 @@ GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; INSTALL_PATH = /usr/local/bin; MACH_O_TYPE = mh_execute; - OTHER_LDFLAGS = "-lpopt"; + OTHER_LDFLAGS = ( + "-lpopt", + "-liconv", + ); PREBINDING = NO; PRODUCT_NAME = test1; }; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
