소스 검색

perl: Have perl's major version number in one central place

This will simplify updating the package in the future.

Signed-off-by: Marcel Denia <naoir@gmx.net>
Marcel Denia 9 년 전
부모
커밋
273d4bd6a7
3개의 변경된 파일22개의 추가작업 그리고 17개의 파일을 삭제
  1. 16
    13
      lang/perl/Makefile
  2. 1
    1
      lang/perl/files/perl-run_tests.sh
  3. 5
    3
      lang/perl/perlmod.mk

+ 16
- 13
lang/perl/Makefile 파일 보기

12
 PKG_RELEASE:=3
12
 PKG_RELEASE:=3
13
 
13
 
14
 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
14
 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
15
-		http://www.cpan.org/src/5.0/perl-5.20.0.tar.gz \
15
+		http://www.cpan.org/src/5.0 \
16
 		ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
16
 		ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
17
 		http://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
17
 		http://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
18
 		ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \
18
 		ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \
157
 endef
157
 endef
158
 
158
 
159
 define Build/InstallDev
159
 define Build/InstallDev
160
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20
161
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/5.20 $(1)/usr/lib/perl5/
160
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/$(PERL_VERSION)
161
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/$(PERL_VERSION) $(1)/usr/lib/perl5/
162
 endef
162
 endef
163
 
163
 
164
 define Package/perl/install
164
 define Package/perl/install
166
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/perl$(PKG_VERSION) $(1)/usr/bin
166
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/perl$(PKG_VERSION) $(1)/usr/bin
167
 	ln -nsf perl$(PKG_VERSION) $(1)/usr/bin/perl
167
 	ln -nsf perl$(PKG_VERSION) $(1)/usr/bin/perl
168
 	
168
 	
169
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/CORE
170
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/5.20/CORE/libperl.so $(1)/usr/lib/perl5/5.20/CORE/
169
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/$(PERL_VERSION)/CORE
170
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/$(PERL_VERSION)/CORE/libperl.so $(1)/usr/lib/perl5/$(PERL_VERSION)/CORE/
171
 endef
171
 endef
172
 
172
 
173
 
173
 
191
 	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)
191
 	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)
192
 	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/Porting
192
 	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/Porting
193
 	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/regen
193
 	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/regen
194
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/XS
195
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/auto/XS
196
-	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/unicore
194
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/$(PERL_VERSION)/XS
195
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/$(PERL_VERSION)/auto/XS
196
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/$(PERL_VERSION)/unicore
197
 	
197
 	
198
 	$(CP) $(PKG_BUILD_DIR)/t $(1)/$(PERL_TESTSDIR)
198
 	$(CP) $(PKG_BUILD_DIR)/t $(1)/$(PERL_TESTSDIR)
199
 	$(CP) $(PKG_BUILD_DIR)/Porting $(1)/$(PERL_TESTSDIR)
199
 	$(CP) $(PKG_BUILD_DIR)/Porting $(1)/$(PERL_TESTSDIR)
202
 	$(CP) $(PKG_BUILD_DIR)/TestInit.pm $(1)/$(PERL_TESTSDIR)
202
 	$(CP) $(PKG_BUILD_DIR)/TestInit.pm $(1)/$(PERL_TESTSDIR)
203
 	$(CP) $(PKG_BUILD_DIR)/vutil.c $(1)/$(PERL_TESTSDIR)
203
 	$(CP) $(PKG_BUILD_DIR)/vutil.c $(1)/$(PERL_TESTSDIR)
204
 	$(CP) $(PKG_BUILD_DIR)/vxs.inc $(1)/$(PERL_TESTSDIR)
204
 	$(CP) $(PKG_BUILD_DIR)/vxs.inc $(1)/$(PERL_TESTSDIR)
205
-	$(CP) $(PKG_BUILD_DIR)/lib/XS $(1)/usr/lib/perl5/5.20/
206
-	$(CP) $(PKG_BUILD_DIR)/lib/auto/XS $(1)/usr/lib/perl5/5.20/auto
207
-	$(CP) $(PKG_BUILD_DIR)/lib/vmsish.pm $(1)/usr/lib/perl5/5.20/
208
-	$(CP) $(PKG_BUILD_DIR)/lib/unicore/TestProp.pl $(1)/usr/lib/perl5/5.20/unicore
205
+	$(CP) $(PKG_BUILD_DIR)/lib/XS $(1)/usr/lib/perl5/$(PERL_VERSION)/
206
+	$(CP) $(PKG_BUILD_DIR)/lib/auto/XS $(1)/usr/lib/perl5/$(PERL_VERSION)/auto
207
+	$(CP) $(PKG_BUILD_DIR)/lib/vmsish.pm $(1)/usr/lib/perl5/$(PERL_VERSION)/
208
+	$(CP) $(PKG_BUILD_DIR)/lib/unicore/TestProp.pl $(1)/usr/lib/perl5/$(PERL_VERSION)/unicore
209
 	$(CP) files/perl-run_tests.sh $(1)/$(PERL_TESTSDIR)/run_tests.sh
209
 	$(CP) files/perl-run_tests.sh $(1)/$(PERL_TESTSDIR)/run_tests.sh
210
-	sed -e 's!%%PERL_DISABLEDTESTS%%!$(PERL_DISABLEDTESTS)!' -i $(1)/$(PERL_TESTSDIR)/run_tests.sh
210
+	sed \
211
+		-e 's!%%PERL_DISABLEDTESTS%%!$(PERL_DISABLEDTESTS)!' \
212
+		-e 's!%%PERL_VERSION%%!$(PERL_VERSION)!' \
213
+		-i $(1)/$(PERL_TESTSDIR)/run_tests.sh
211
 	$(CP) $(PKG_BUILD_DIR)/config_h.SH $(1)/$(PERL_TESTSDIR)
214
 	$(CP) $(PKG_BUILD_DIR)/config_h.SH $(1)/$(PERL_TESTSDIR)
212
 	$(CP) $(PKG_BUILD_DIR)/perl.h $(1)/$(PERL_TESTSDIR)
215
 	$(CP) $(PKG_BUILD_DIR)/perl.h $(1)/$(PERL_TESTSDIR)
213
 endef
216
 endef

+ 1
- 1
lang/perl/files/perl-run_tests.sh 파일 보기

1
 #!/bin/sh
1
 #!/bin/sh
2
 
2
 
3
 PERL_TESTSDIR="/usr/share/perl/perl-tests"
3
 PERL_TESTSDIR="/usr/share/perl/perl-tests"
4
-PERL_LIBDIR="/usr/lib/perl5/5.20/"
4
+PERL_LIBDIR="/usr/lib/perl5/%%PERL_VERSION%%/"
5
 PERL_DISABLEDTESTS="%%PERL_DISABLEDTESTS%%"
5
 PERL_DISABLEDTESTS="%%PERL_DISABLEDTESTS%%"
6
 
6
 
7
 if [ ! -f "$PERL_TESTSDIR/__prepared" ]; then
7
 if [ ! -f "$PERL_TESTSDIR/__prepared" ]; then

+ 5
- 3
lang/perl/perlmod.mk 파일 보기

1
 # This makefile simplifies perl module builds.
1
 # This makefile simplifies perl module builds.
2
 #
2
 #
3
 
3
 
4
+PERL_VERSION:=5.20
5
+
4
 # Build environment
6
 # Build environment
5
 HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
7
 HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
6
 ifneq ($(CONFIG_USE_GLIBC),)
8
 ifneq ($(CONFIG_USE_GLIBC),)
7
 	EXTRA_LIBS:=bsd
9
 	EXTRA_LIBS:=bsd
8
 	EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
10
 	EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
9
 endif
11
 endif
10
-PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl5.20.0
12
+PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl$(PERL_VERSION).0
11
 
13
 
12
 MOD_CFLAGS_PERL:=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)
14
 MOD_CFLAGS_PERL:=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)
13
 ifdef CONFIG_PERL_THREADS
15
 ifdef CONFIG_PERL_THREADS
15
 endif
17
 endif
16
 
18
 
17
 # Module install prefix
19
 # Module install prefix
18
-PERL_SITELIB:=/usr/lib/perl5/5.20
20
+PERL_SITELIB:=/usr/lib/perl5/$(PERL_VERSION)
19
 PERL_TESTSDIR:=/usr/share/perl/perl-tests
21
 PERL_TESTSDIR:=/usr/share/perl/perl-tests
20
 PERLBASE_TESTSDIR:=/usr/share/perl/perlbase-tests
22
 PERLBASE_TESTSDIR:=/usr/share/perl/perlbase-tests
21
 PERLMOD_TESTSDIR:=/usr/share/perl/perlmod-tests
23
 PERLMOD_TESTSDIR:=/usr/share/perl/perlmod-tests
102
 		LINKTYPE=dynamic \
104
 		LINKTYPE=dynamic \
103
 		DESTDIR=$(PKG_INSTALL_DIR) \
105
 		DESTDIR=$(PKG_INSTALL_DIR) \
104
 	);
106
 	);
105
-	sed 's!^PERL_INC = .*!PERL_INC = $(STAGING_DIR)/usr/lib/perl5/5.20/CORE/!' -i $(PKG_BUILD_DIR)/Makefile
107
+	sed 's!^PERL_INC = .*!PERL_INC = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/CORE/!' -i $(PKG_BUILD_DIR)/Makefile
106
 endef
108
 endef
107
 
109
 
108
 define perlmod/Compile
110
 define perlmod/Compile