From bf09c9742d713e509b72561441ebfab7ad1c0311 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 00:35:34 +0800 Subject: [PATCH 1/8] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ed3098..cadac63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,3 @@ language: go -sudo: false +script: + - sudo apt-get install libiconv-hook-dev From fe21aa77cc5d64a79f37c3be02619e50a9126d24 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 00:35:45 +0800 Subject: [PATCH 2/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cadac63..f74279b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: go script: - - sudo apt-get install libiconv-hook-dev +- sudo apt-get install libiconv-hook-dev From cb8f9bdb60d56eaa7160cd4755a4db9c39aeb12c Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 00:36:57 +0800 Subject: [PATCH 3/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f74279b..9cdd7a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: go script: -- sudo apt-get install libiconv-hook-dev + - sudo apt-get install libiconv-hook-dev From ec2059ad944d090bdb9ed11feb47e9bfed2f4682 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 08:35:34 +0800 Subject: [PATCH 4/8] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cdd7a4..4f2ee4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1 @@ language: go -script: - - sudo apt-get install libiconv-hook-dev From 15515f067a8e69d78d329d6ba12e5f8f02c9d465 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 08:42:34 +0800 Subject: [PATCH 5/8] Update .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4f2ee4d..86a27cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,7 @@ language: go +install: + - export QINIU_SRC=$HOME/gopath/src + - mkdir -p $QINIU_SRC/gopkg.in + - mv $QINIU_SRC/github.com/qiniu/iconv $QINIU_SRC/gopkg.in/iconv.v1 + - export TRAVIS_BUILD_DIR=$QINIU_SRC/gopkg.in/iconv.v1 + - cd $TRAVIS_BUILD_DIR From f9e9c67bccd24eccdd82dd9218d50434f04d0036 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 08:45:34 +0800 Subject: [PATCH 6/8] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 86a27cd..376cf1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: go +sudo: false install: - export QINIU_SRC=$HOME/gopath/src - mkdir -p $QINIU_SRC/gopkg.in From 771299e45c92fb48d44914448d6c6674374d514b Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 08:49:17 +0800 Subject: [PATCH 7/8] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 376cf1e..90302f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,6 @@ install: - mkdir -p $QINIU_SRC/gopkg.in - mv $QINIU_SRC/github.com/qiniu/iconv $QINIU_SRC/gopkg.in/iconv.v1 - export TRAVIS_BUILD_DIR=$QINIU_SRC/gopkg.in/iconv.v1 +script: - cd $TRAVIS_BUILD_DIR + - go install -v ./... From 117a1d114434e2ea4b4bead872147daf33068e9b Mon Sep 17 00:00:00 2001 From: xushiwei Date: Wed, 13 Apr 2016 08:54:06 +0800 Subject: [PATCH 8/8] x --- iconv.go | 1 - 1 file changed, 1 deletion(-) diff --git a/iconv.go b/iconv.go index dadfdbc..d625c6f 100644 --- a/iconv.go +++ b/iconv.go @@ -5,7 +5,6 @@ package iconv // #cgo darwin LDFLAGS: -liconv // #cgo freebsd LDFLAGS: -liconv -// #cgo linux LDFLAGS: -liconv // #cgo windows LDFLAGS: -liconv // #include // #include